drm/i915/dram: pass display to macros that expect display

Underneath, the HAS_DISPLAY() and DISPLAY_VER() macros really expect
struct intel_display. Switch to it in preparation for removing the
transitional __to_intel_display() macro.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/ee8bba57924629f97945b9cf05727ae7c0dfb8fd.1754499175.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
index 3eeaabdf59e8c154bc5d4af47753fa77558020a8..b3c407cc200f6eea48b4cfd4537897f3fe3c9a62 100644 (file)
--- a/drivers/gpu/drm/i915/soc/intel_dram.c
+++ b/drivers/gpu/drm/i915/soc/intel_dram.c
@@ -710,13 +710,14 @@ static int xelpdp_get_dram_info(struct drm_i915_private *i915, struct dram_info
 
 int intel_dram_detect(struct drm_i915_private *i915)
 {
+       struct intel_display *display = i915->display;
        struct dram_info *dram_info;
        int ret;
 
        detect_fsb_freq(i915);
        detect_mem_freq(i915);
 
-       if (GRAPHICS_VER(i915) < 9 || IS_DG2(i915) || !HAS_DISPLAY(i915))
+       if (GRAPHICS_VER(i915) < 9 || IS_DG2(i915) || !HAS_DISPLAY(display))
                return 0;
 
        dram_info = drmm_kzalloc(&i915->drm, sizeof(*dram_info), GFP_KERNEL);
@@ -731,7 +732,7 @@ int intel_dram_detect(struct drm_i915_private *i915)
         */
        dram_info->wm_lv_0_adjust_needed = !IS_BROXTON(i915) && !IS_GEMINILAKE(i915);
 
-       if (DISPLAY_VER(i915) >= 14)
+       if (DISPLAY_VER(display) >= 14)
                ret = xelpdp_get_dram_info(i915, dram_info);
        else if (GRAPHICS_VER(i915) >= 12)
                ret = gen12_get_dram_info(i915, dram_info);