drm/i915/uncore: pass display to HAS_FPGA_DBG_UNCLAIMED()

Underneath, HAS_FPGA_DBG_UNCLAIMED() really expects 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/e8cda779e192095dfa35d618f88bf7bfa526ac06.1754499175.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index c8e29fd72290ab3ff8b8884c45899cf30e13bbdf..4ccba7c8ffb30f5428649f609e521c7f196ddd06 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -2502,6 +2502,7 @@ static int sanity_check_mmio_access(struct intel_uncore *uncore)
 int intel_uncore_init_mmio(struct intel_uncore *uncore)
 {
        struct drm_i915_private *i915 = uncore->i915;
+       struct intel_display *display = i915->display;
        int ret;
 
        ret = sanity_check_mmio_access(uncore);
@@ -2536,7 +2537,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore)
        GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.read_fw_domains);
        GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.write_fw_domains);
 
-       if (HAS_FPGA_DBG_UNCLAIMED(i915))
+       if (HAS_FPGA_DBG_UNCLAIMED(display))
                uncore->flags |= UNCORE_HAS_FPGA_DBG_UNCLAIMED;
 
        if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))

diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c b/drivers/gpu/drm/i915/selftests/intel_uncore.c
index 41eaa9b7f67d0ebc400d927dc923ae119ae31048..58bcbdcef56328a2633ae099180d5b954e30fe2c 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/intel_uncore.c
+++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c
@@ -277,13 +277,15 @@ static int live_forcewake_domains(void *arg)
 #define FW_RANGE 0x40000
        struct intel_gt *gt = arg;
        struct intel_uncore *uncore = gt->uncore;
+       struct drm_i915_private *i915 = gt->i915;
+       struct intel_display *display = i915->display;
        unsigned long *valid;
        u32 offset;
        int err;
 
-       if (!HAS_FPGA_DBG_UNCLAIMED(gt->i915) &&
-           !IS_VALLEYVIEW(gt->i915) &&
-           !IS_CHERRYVIEW(gt->i915))
+       if (!HAS_FPGA_DBG_UNCLAIMED(display) &&
+           !IS_VALLEYVIEW(i915) &&
+           !IS_CHERRYVIEW(i915))
                return 0;
 
        /*