drm/vmwgfx: 3D disabled should not effect STDU memory limits

This limit became a hard cap starting with the change referenced below.
Surface creation on the device will fail if the requested size is larger
than this limit so altering the value arbitrarily will expose modes that
are too large for the device's hard limits.

Fixes: 7ebb47c9f9ab ("drm/vmwgfx: Read new register for GB memory when available")
Signed-off-by: Ian Forbes <ian.forbes@broadcom.com>
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240521184720.767-3-ian.forbes@broadcom.com

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 8f1730aeacc9eb5e0a35297e9df4be5eca7046aa..18a1f05c6fa857bf2f67cae064a62bba8aa0215d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -960,13 +960,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id)
                                vmw_read(dev_priv,
                                         SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
 
-               /*
-                * Workaround for low memory 2D VMs to compensate for the
-                * allocation taken by fbdev
-                */
-               if (!(dev_priv->capabilities & SVGA_CAP_3D))
-                       mem_size *= 3;
-
                dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;
                dev_priv->max_primary_mem =
                        vmw_read(dev_priv, SVGA_REG_MAX_PRIMARY_MEM);