From patchwork Mon Sep 27 13:20:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 212532 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8RDdbqG023649 for ; Mon, 27 Sep 2010 13:39:57 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C9D49E85A for ; Mon, 27 Sep 2010 06:39:37 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [65.115.85.73]) by gabe.freedesktop.org (Postfix) with ESMTP id 28F37A0280 for ; Mon, 27 Sep 2010 06:31:37 -0700 (PDT) Received: from mailhost3.vmware.com (mailhost3.vmware.com [10.16.27.45]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 17CEF18009; Mon, 27 Sep 2010 06:31:37 -0700 (PDT) Received: from localhost.localdomain (unknown [10.16.255.1]) by mailhost3.vmware.com (Postfix) with ESMTP id 13538CD911; Mon, 27 Sep 2010 06:31:35 -0700 (PDT) From: Thomas Hellstrom To: airlied@redhat.com Subject: [PATCH 14/15] vmwgfx: Save at least one screen layout Date: Mon, 27 Sep 2010 15:20:31 +0200 Message-Id: <1285593632-10585-15-git-send-email-thellstrom@vmware.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1285593632-10585-14-git-send-email-thellstrom@vmware.com> References: <1285593632-10585-1-git-send-email-thellstrom@vmware.com> <1285593632-10585-2-git-send-email-thellstrom@vmware.com> <1285593632-10585-3-git-send-email-thellstrom@vmware.com> <1285593632-10585-4-git-send-email-thellstrom@vmware.com> <1285593632-10585-5-git-send-email-thellstrom@vmware.com> <1285593632-10585-6-git-send-email-thellstrom@vmware.com> <1285593632-10585-7-git-send-email-thellstrom@vmware.com> <1285593632-10585-8-git-send-email-thellstrom@vmware.com> <1285593632-10585-9-git-send-email-thellstrom@vmware.com> <1285593632-10585-10-git-send-email-thellstrom@vmware.com> <1285593632-10585-11-git-send-email-thellstrom@vmware.com> <1285593632-10585-12-git-send-email-thellstrom@vmware.com> <1285593632-10585-13-git-send-email-thellstrom@vmware.com> <1285593632-10585-14-git-send-email-thellstrom@vmware.com> Cc: Thomas Hellstrom , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Sep 2010 13:39:58 +0000 (UTC) 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);