drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code.

We should not use SVGA_REG_ENABLE anywhere but in the fifo setup code,
since it controls whether the device is active.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index fb66e62b8e2ce4966af885e529142e1607c71be6..06f431442e92dbf712027a57c2def997d535a02d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -153,7 +153,6 @@ static int vmw_fb_set_par(struct fb_info *info)
        struct vmw_private *vmw_priv = par->vmw_priv;
 
        if (vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) {
-               vmw_write(vmw_priv, SVGA_REG_ENABLE, 0);
                vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, 0);
                vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true);
                vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_X, 0);
@@ -175,13 +174,10 @@ static int vmw_fb_set_par(struct fb_info *info)
                vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres);
                vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
                vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1);
-               vmw_write(vmw_priv, SVGA_REG_ENABLE, 1);
        } else {
-               vmw_write(vmw_priv, SVGA_REG_ENABLE, 0);
                vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres,
                                   info->fix.line_length,
                                   par->bpp, par->depth);
-               vmw_write(vmw_priv, SVGA_REG_ENABLE, 1);
 
        }
 

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index b35d7b0fd48decadc80e96614f80566126b516b1..d98b1b1a8705e401444ce789ea124aebca852722 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -107,16 +107,12 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
                        return 0;
                fb = entry->base.crtc.fb;
 
-               vmw_write(dev_priv, SVGA_REG_ENABLE, 0);
                vmw_kms_write_svga(dev_priv, w, h, fb->pitch,
                                   fb->bits_per_pixel, fb->depth);
-               vmw_write(dev_priv, SVGA_REG_ENABLE, 1);
 
                return 0;
        }
 
-       vmw_write(dev_priv, SVGA_REG_ENABLE, 0);
-
        for (i = 0; i < lds->last_num_active; i++) {
                vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, i);
                vmw_write(dev_priv, SVGA_REG_DISPLAY_IS_PRIMARY, !i);
@@ -152,7 +148,6 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
 
        /* Make sure we always show something. */
        vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, i ? i : 1);
-       vmw_write(dev_priv, SVGA_REG_ENABLE, 1);
 
        BUG_ON(i != lds->num_active);