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

Commit 6bcca0bc authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Greg Kroah-Hartman
Browse files

drm/vmwgfx: Fix setting of dma masks 



commit 4cbfa1e6c09e98450aab3240e5119b0ab2c9795b upstream.

Previously we set only the dma mask and not the coherent mask. Fix that.
Also, for clarity, make sure both are initially set to 64 bits.

Cc: <stable@vger.kernel.org>
Fixes: 0d00c488: ("drm/vmwgfx: Fix the driver for large dma addresses")
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarDeepak Rawat <drawat@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1cd557e

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+6 −3
Original line number Diff line number Diff line
@@ -594,13 +594,16 @@ out_fixup: 
static int vmw_dma_masks(struct vmw_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;

	int ret = 0;



	if (intel_iommu_enabled &&

	ret = dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(64));

	if (dev_priv->map_mode != vmw_dma_phys &&

	    (sizeof(unsigned long) == 4 || vmw_restrict_dma_mask)) {

		DRM_INFO("Restricting DMA addresses to 44 bits.\n");

		return dma_set_mask(dev->dev, DMA_BIT_MASK(44));

		return dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(44));

	}

	return 0;



	return ret;

}

#else

static int vmw_dma_masks(struct vmw_private *dev_priv)