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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190107181856.23789-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c
index a0c7cbc212bad4db3d1c050e6b85f9ed6a95ceef..6c10734e948d7d89d1c283e2c70e5bea85a55899 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/selftests/huge_pages.c
@@ -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)) {

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 43ed8b28aeaa0ce86c6162814b5b9f30ce981b70..baa3c38919deebf128969b1fcbbbb2e738c325d5 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -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 */