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

Commit d58f0083 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/selftests: Mark the whole mock device as DMA capable 

Being a mock device, we suffer no DMA restrictions, so set the coherent
mask to 64b.

v2: Fix up mock_huge_selftests

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109243


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190107181856.23789-1-chris@chris-wilson.co.uk
parent f6e8aa38

drivers/gpu/drm/i915/selftests/huge_pages.c

+0 −4
Original line number Diff line number Diff line
@@ -1702,7 +1702,6 @@ int i915_gem_huge_page_mock_selftests(void) 
	};

	struct drm_i915_private *dev_priv;

	struct i915_hw_ppgtt *ppgtt;

	struct pci_dev *pdev;

	int err;



	dev_priv = mock_gem_device();
@@ -1712,9 +1711,6 @@ int i915_gem_huge_page_mock_selftests(void) 
	/* Pretend to be a device which supports the 48b PPGTT */

	mkwrite_device_info(dev_priv)->ppgtt = INTEL_PPGTT_FULL_4LVL;



	pdev = dev_priv->drm.pdev;

	dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(39));



	mutex_lock(&dev_priv->drm.struct_mutex);

	ppgtt = i915_ppgtt_create(dev_priv, ERR_PTR(-ENODEV));

	if (IS_ERR(ppgtt)) {

drivers/gpu/drm/i915/selftests/mock_gem_device.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct drm_i915_private *mock_gem_device(void) 
	pdev->class = PCI_BASE_CLASS_DISPLAY << 16;

	pdev->dev.release = release_dev;

	dev_set_name(&pdev->dev, "mock");

	dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));



#if IS_ENABLED(CONFIG_IOMMU_API) && defined(CONFIG_INTEL_IOMMU)

	/* hack to disable iommu for the fake device; force identity mapping */