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

[ Upstream commit fb5e19d2dd03eb995ccd468d599b2337f7f66555 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 58fb40c93100a84ec8b1dd769f35ab31c00bd0dc..bea576434e475c9eed5f3d083c63c93258712a36 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -956,13 +956,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);