Commit 6a591a96 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie

drm/vmwgfx: Fix single framebuffer detection.

V2: Fix a typo.
Signed-off-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7e71f8a5
...@@ -130,6 +130,7 @@ static int vmw_ldu_del_active(struct vmw_private *vmw_priv, ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment