drm/vmwgfx: Fix setting of dma masks

thomashvmw · thomashvmw · commit 4cbfa1e6c09e · 2019-02-05T13:54:21.000+01:00
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: 0d00c48: ("drm/vmwgfx: Fix the driver for large dma addresses") Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Deepak Rawat <drawat@vmware.com>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -600,13 +600,16 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)
 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;
 }
 
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)

Original file line number	Diff line number	Diff line change
`@@ -600,13 +600,16 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)`
`600`	`600`	`static int vmw_dma_masks(struct vmw_private *dev_priv)`
`601`	`601`	`{`
`602`	`602`	`struct drm_device *dev = dev_priv->dev;`
	`603`	`+ int ret = 0;`
`603`	`604`
`604`		`- if (intel_iommu_enabled &&`
	`605`	`+ ret = dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(64));`
	`606`	`+ if (dev_priv->map_mode != vmw_dma_phys &&`
`605`	`607`	`(sizeof(unsigned long) == 4 \|\| vmw_restrict_dma_mask)) {`
`606`	`608`	`DRM_INFO("Restricting DMA addresses to 44 bits.\n");`
`607`		`- return dma_set_mask(dev->dev, DMA_BIT_MASK(44));`
	`609`	`+ return dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(44));`
`608`	`610`	`}`
`609`		`- return 0;`
	`611`	`+`
	`612`	`+ return ret;`
`610`	`613`	`}`
`611`	`614`
`612`	`615`	`static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)`