From 0d0afcec5d93fa18222eded366338c2294fe2869 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Tue, 5 Oct 2010 12:43:08 +0200 Subject: [PATCH] --- yaml --- r: 218155 b: refs/heads/master c: 029e50bfc231741c533128e7e806850557f8e97f h: refs/heads/master i: 218153: a901d65d2b9842bc9f3a344bb304cd1624ac9d8c 218151: 39922aed90486177484441b5e0cde6158561e66e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a4952c3341c0..96acf94b433c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73558ead6467f0590fe58a03a16a94d2a934178b +refs/heads/master: 029e50bfc231741c533128e7e806850557f8e97f diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 5fb68f3981a2..87c6e6156d7d 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/trunk/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);