Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 01:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/vmwgfx: Fix single framebuffer detection.

Browse Source 
V2: Fix a typo.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Jakob Bornecrantz 2010-05-28 11:21:55 +02:00 committed by Dave Airlie
parent 7e71f8a59e
commit 6a591a96d7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
View File

@ -130,6 +130,7 @@ static int vmw_ldu_del_active(struct vmw_private *vmw_priv,
if (list_empty(&ldu->active)) if (list_empty(&ldu->active))
return 0; return 0;
/* Must init otherwise list_empty(&ldu->active) will not work. */
list_del_init(&ldu->active); list_del_init(&ldu->active);
if (--(ld->num_active) == 0) { if (--(ld->num_active) == 0) {
BUG_ON(!ld->fb); BUG_ON(!ld->fb);
@ -208,6 +209,8 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set)
/* ldu only supports one fb active at the time */ /* ldu only supports one fb active at the time */
if (dev_priv->ldu_priv->fb && vfb && if (dev_priv->ldu_priv->fb && vfb &&
!(dev_priv->ldu_priv->num_active == 1 &&
!list_empty(&ldu->active)) &&
dev_priv->ldu_priv->fb != vfb) { dev_priv->ldu_priv->fb != vfb) {
DRM_ERROR("Multiple framebuffers not supported\n"); DRM_ERROR("Multiple framebuffers not supported\n");
return -EINVAL; return -EINVAL;