drm/vmwgfx: Read new register for GB memory when available

Virtual device added new register for suggested GB memory, read the new
register when available.

Signed-off-by: Deepak Rawat <drawat.floss@gmail.com>
Reviewed-by: Thomas Hellström (VMware) <thomas_os@shipmail.org>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index b55bd3b5f5cd0394d679cbe4ef7592d5d743bc6c..71e45b568511b31f55f41acebb85d0319c7a8e8c 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -720,9 +720,15 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        dev_priv->max_mob_pages = 0;
        dev_priv->max_mob_size = 0;
        if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS) {
-               uint64_t mem_size =
-                       vmw_read(dev_priv,
-                                SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
+               uint64_t mem_size;
+
+               if (dev_priv->capabilities2 & SVGA_CAP2_GB_MEMSIZE_2)
+                       mem_size = vmw_read(dev_priv,
+                                           SVGA_REG_GBOBJECT_MEM_SIZE_KB);
+               else
+                       mem_size =
+                               vmw_read(dev_priv,
+                                        SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
 
                /*
                 * Workaround for low memory 2D VMs to compensate for the