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

Commit a1c2d608 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes (again) from Dave Airlie:
 "dropped the ball on a vmware patch, so two more fixes for vmwgfx are
  here, one for hibernate issue, one for a BUG trigger."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
  drm/vmwgfx: Fix hibernation device reset
parents 63d4ec87 afcc87aa

drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin) 




	BUG_ON(!atomic_read(&bo->reserved));

	BUG_ON(!atomic_read(&bo->reserved));

	BUG_ON(old_mem_type != TTM_PL_VRAM &&

	BUG_ON(old_mem_type != TTM_PL_VRAM &&

	       old_mem_type != VMW_PL_FLAG_GMR);

	       old_mem_type != VMW_PL_GMR);





	pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;

	pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;

	if (pin)

	if (pin)

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1098,6 +1098,11 @@ static void vmw_pm_complete(struct device *kdev) 
	struct drm_device *dev = pci_get_drvdata(pdev);

	struct drm_device *dev = pci_get_drvdata(pdev);

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct vmw_private *dev_priv = vmw_priv(dev);





	mutex_lock(&dev_priv->hw_mutex);

	vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2);

	(void) vmw_read(dev_priv, SVGA_REG_ID);

	mutex_unlock(&dev_priv->hw_mutex);



	/**

	/**

	 * Reclaim 3d reference held by fbdev and potentially

	 * Reclaim 3d reference held by fbdev and potentially

	 * start fifo.

	 * start fifo.