drm/i915/display: switch to display->platform.dgfx from IS_DGFX()

Prefer display->platform.dgfx based platform detection over the old
IS_DGFX() macro.

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/99de7f8f26156afbddcdac850088e6a96d322c55.1744222449.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index fabfcf2caa69e7a55686875d35ada4a331ce1b05..8fe854a452437343fb765fe32c3b2d5d6330734d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -3126,7 +3126,7 @@ static const struct vbt_header *intel_bios_get_vbt(struct intel_display *display
         * If the OpRegion does not have VBT, look in SPI flash
         * through MMIO or PCI mapping
         */
-       if (!vbt && IS_DGFX(i915))
+       if (!vbt && display->platform.dgfx)
                with_intel_display_rpm(display)
                        vbt = oprom_get_vbt(display, intel_rom_spi(i915), sizep, "SPI flash");
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 2b0e0f220442f1d30d50b1bdb33a4b00e2eaccc8..05393bd60c989bb54064f9f62510d0f189cabae3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -560,11 +560,11 @@ static bool plane_has_modifier(struct intel_display *display,
                return false;
 
        if (md->modifier == I915_FORMAT_MOD_4_TILED_BMG_CCS &&
-           (GRAPHICS_VER(i915) < 20 || !IS_DGFX(i915)))
+           (GRAPHICS_VER(i915) < 20 || !display->platform.dgfx))
                return false;
 
        if (md->modifier == I915_FORMAT_MOD_4_TILED_LNL_CCS &&
-           (GRAPHICS_VER(i915) < 20 || IS_DGFX(i915)))
+           (GRAPHICS_VER(i915) < 20 || display->platform.dgfx))
                return false;
 
        return true;

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index b0c4892775ce6a1be1e8d7ccfba1f8a95ab8add2..c00d9184c5866d777042bafb151738e91f0af399 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -53,9 +53,11 @@ intel_reuse_initial_plane_obj(struct intel_crtc *this,
 }
 
 static enum intel_memory_type
-initial_plane_memory_type(struct drm_i915_private *i915)
+initial_plane_memory_type(struct intel_display *display)
 {
-       if (IS_DGFX(i915))
+       struct drm_i915_private *i915 = to_i915(display->drm);
+
+       if (display->platform.dgfx)
                return INTEL_MEMORY_LOCAL;
        else if (HAS_LMEMBAR_SMEM_STOLEN(i915))
                return INTEL_MEMORY_STOLEN_LOCAL;
@@ -75,7 +77,7 @@ initial_plane_phys(struct intel_display *display,
        dma_addr_t dma_addr;
        u32 base;
 
-       mem_type = initial_plane_memory_type(i915);
+       mem_type = initial_plane_memory_type(display);
        mem = intel_memory_region_by_type(i915, mem_type);
        if (!mem) {
                drm_dbg_kms(display->drm,