From: Thomas Hellstrom Subject: [PATCH 10/11] vmwgfx: Save at least one screen layout Date: Tue, 5 Oct 2010 12:43:08 +0200 Message-ID: <1286275389-26641-11-git-send-email-thellstrom@vmware.com> References: <1286275389-26641-1-git-send-email-thellstrom@vmware.com> <1286275389-26641-2-git-send-email-thellstrom@vmware.com> <1286275389-26641-3-git-send-email-thellstrom@vmware.com> <1286275389-26641-4-git-send-email-thellstrom@vmware.com> <1286275389-26641-5-git-send-email-thellstrom@vmware.com> <1286275389-26641-6-git-send-email-thellstrom@vmware.com> <1286275389-26641-7-git-send-email-thellstrom@vmware.com> <1286275389-26641-8-git-send-email-thellstrom@vmware.com> <1286275389-26641-9-git-send-email-thellstrom@vmware.com> <1286275389-26641-10-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [65.115.85.69]) by gabe.freedesktop.org (Postfix) with ESMTP id E03D09F39C for ; Tue, 5 Oct 2010 03:43:38 -0700 (PDT) In-Reply-To: <1286275389-26641-10-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@redhat.com Cc: Thomas Hellstrom , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Save at least one screen layout during vga save to avoid odd things happening during restore. Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 5fb68f3..87c6e61 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); -- 1.6.2.5