From: Thomas Hellstrom Date: Tue, 5 Oct 2010 10:43:08 +0000 (+0200) Subject: drm/vmwgfx: Save at least one screen layout X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=029e50bfc231741c533128e7e806850557f8e97f;p=linux-beck.git drm/vmwgfx: Save at least one screen layout Save at least one screen layout during vga save to avoid odd things happening during restore. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 5fb68f3981a2..87c6e6156d7d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1025,6 +1025,9 @@ int vmw_kms_save_vga(struct vmw_private *vmw_priv) vmw_priv->num_displays = vmw_read(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS); + if (vmw_priv->num_displays == 0) + vmw_priv->num_displays = 1; + for (i = 0; i < vmw_priv->num_displays; ++i) { save = &vmw_priv->vga_save[i]; vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, i);