summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSinclair Yeh <syeh@vmware.com>2017-11-01 10:47:05 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-15 17:13:13 +0100
commitba4828af60e227fffb6ccca2e17c64938e7a5d0d (patch)
treefac98e7074742bc38391adaa8ba246b929e70f61
parent05b690ccb077eccb6a1aeb610456dbd5ea7f04a1 (diff)
downloadlinux-stable-ba4828af60e227fffb6ccca2e17c64938e7a5d0d.tar.gz
linux-stable-ba4828af60e227fffb6ccca2e17c64938e7a5d0d.tar.bz2
linux-stable-ba4828af60e227fffb6ccca2e17c64938e7a5d0d.zip
drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
commit cef75036c40408ba3bc308bcb00a3d440da713fc upstream. This is an extension of Commit 7c20d213dd3c ("drm/vmwgfx: Work around mode set failure in 2D VMs") With Wayland desktop and atomic mode set, during the mode setting process there is a moment when two framebuffer sized surfaces are being pinned. This was not an issue with Xorg. Since this only happens during a mode change, there should be no performance impact by increasing allowable mem_size. Signed-off-by: Sinclair Yeh <syeh@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index f3f31f995878..be3971b22a02 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -708,7 +708,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
* allocation taken by fbdev
*/
if (!(dev_priv->capabilities & SVGA_CAP_3D))
- mem_size *= 2;
+ mem_size *= 3;
dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;
dev_priv->prim_bb_mem =