[Intel-gfx] [PATCH 20/20] HAX: DG1 small BAR

[Matthew Auld]

Just for CI.

Signed-off-by: Matthew Auld <matthew.a...@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_create.c  | 5 ++---
 drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c 
b/drivers/gpu/drm/i915/gem/i915_gem_create.c
index 98d63cb21e94..6e6a3f6685ab 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_create.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c
@@ -437,9 +437,8 @@ i915_gem_create_ext_ioctl(struct drm_device *dev, void 
*data,
                if (!(ext_data.placement_mask & BIT(INTEL_REGION_SMEM)))
                        return -EINVAL;
        } else {
-               if (!IS_DG1(i915) && (ext_data.n_placements > 1 ||
-                                     ext_data.placements[0]->type !=
-                                     INTEL_MEMORY_SYSTEM))
+               if (ext_data.n_placements > 1 ||
+                   ext_data.placements[0]->type != INTEL_MEMORY_SYSTEM)
                        ext_data.flags |= I915_BO_ALLOC_TOPDOWN;
        }
 
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c 
b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index b788fc2b3df8..a99516d2b706 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -211,7 +211,7 @@ static struct intel_memory_region *setup_lmem(struct 
intel_gt *gt)
        lmem_size = intel_uncore_read64(uncore, GEN12_GSMBASE);
 
        io_start = pci_resource_start(pdev, 2);
-       io_size = min(pci_resource_len(pdev, 2), lmem_size);
+       io_size = SZ_256M;
        if (!io_size)
                return ERR_PTR(-ENODEV);
 
-- 
2.34.1