From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed, 21 Nov 2012 10:09:56 +0000 (+0100)
Subject: drm/vmwgfx: Read bounding box memory from the appropriate register
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=afb0e50fae3aaeef2ca58e27cf650cb388846f19;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/vmwgfx: Read bounding box memory from the appropriate register

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
---

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index a7dc14a9e94b..eaffb0524092 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -650,13 +650,18 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 				 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
 
 		dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;
-	}
+		dev_priv->prim_bb_mem =
+			vmw_read(dev_priv,
+				 SVGA_REG_MAX_PRIMARY_BOUNDING_BOX_MEM);
+	} else
+		dev_priv->prim_bb_mem = dev_priv->vram_size;
 
 	ret = vmw_dma_masks(dev_priv);
 	if (unlikely(ret != 0))
 		goto out_err0;
 
-	dev_priv->prim_bb_mem = dev_priv->vram_size;
+	if (unlikely(dev_priv->prim_bb_mem < dev_priv->vram_size))
+		dev_priv->prim_bb_mem = dev_priv->vram_size;
 
 	mutex_unlock(&dev_priv->hw_mutex);