drm/i915: Remove counter productive REGION_* wrappers

This extra macro level between the region IDs and their bitmasks
just makes it harder to see what is used where. Get rid of the
wrappers.

Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Rodrigo Vivi <[email protected]>

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 8b4fdeabb12a525f0233acbffb6c95272560f791..37a1d530a59c469afd8e6b5267b3f16e236b603c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -81,7 +81,7 @@
        .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K
 
 #define GEN_DEFAULT_REGIONS \
-       .memory_regions = REGION_SMEM | REGION_STOLEN_SMEM
+       .memory_regions = BIT(INTEL_REGION_SMEM) | BIT(INTEL_REGION_STOLEN_SMEM)
 
 #define I830_FEATURES \
        GEN(2), \
@@ -660,7 +660,7 @@ static const struct intel_device_info rkl_info = {
 };
 
 #define DGFX_FEATURES \
-       .memory_regions = REGION_SMEM | REGION_LMEM | REGION_STOLEN_LMEM, \
+       .memory_regions = BIT(INTEL_REGION_SMEM) | BIT(INTEL_REGION_LMEM_0) | BIT(INTEL_REGION_STOLEN_LMEM), \
        .has_llc = 0, \
        .has_pxp = 0, \
        .has_snoop = 1, \
@@ -835,7 +835,7 @@ static const struct intel_device_info mtl_info = {
        .has_snoop = 1,
        .max_pat_index = 4,
        .has_pxp = 1,
-       .memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
+       .memory_regions = BIT(INTEL_REGION_SMEM) | BIT(INTEL_REGION_STOLEN_LMEM),
        .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),
        MTL_CACHELEVEL,
 };

diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 9ba36454e51b0a99c4b2dc76be07bdc118067ca1..72496e401016bed0f587ad64d44247c89890c8cf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -38,11 +38,6 @@ enum intel_region_id {
        INTEL_REGION_UNKNOWN, /* Should be last */
 };
 
-#define REGION_SMEM     BIT(INTEL_REGION_SMEM)
-#define REGION_LMEM     BIT(INTEL_REGION_LMEM_0)
-#define REGION_STOLEN_SMEM   BIT(INTEL_REGION_STOLEN_SMEM)
-#define REGION_STOLEN_LMEM   BIT(INTEL_REGION_STOLEN_LMEM)
-
 #define I915_ALLOC_CONTIGUOUS     BIT(0)
 
 #define for_each_memory_region(mr, i915, id) \

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index af349fd9abc2a1c13c12ca03f1a7fac7e2057287..0bd29846873b3958e0d5b7968e184f71cae49479 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -122,7 +122,7 @@ static const struct intel_device_info mock_info = {
        .__runtime.page_sizes = (I915_GTT_PAGE_SIZE_4K |
                                 I915_GTT_PAGE_SIZE_64K |
                                 I915_GTT_PAGE_SIZE_2M),
-       .memory_regions = REGION_SMEM,
+       .memory_regions = BIT(INTEL_REGION_SMEM),
        .platform_engine_mask = BIT(0),
 
        /* simply use legacy cache level for mock device */