Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17208f1d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes 

One vmwgfx blackscreen fix and trivial patch.

* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
  drm/vmwgfx: constify vmw_fence_ops
parents 39dae59d cef75036

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,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 =

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static long vmw_fence_wait(struct dma_fence *f, bool intr, signed long timeout) 
	return ret;

}



static struct dma_fence_ops vmw_fence_ops = {

static const struct dma_fence_ops vmw_fence_ops = {

	.get_driver_name = vmw_fence_get_driver_name,

	.get_timeline_name = vmw_fence_get_timeline_name,

	.enable_signaling = vmw_fence_enable_signaling,