[PATCH 12/15] drm/i915/uncore: pass display to HAS_FPGA_DBG_UNCLAIMED()

[Jani Nikula]

Underneath, HAS_FPGA_DBG_UNCLAIMED() really expects struct
intel_display. Switch to it in preparation for removing the transitional
__to_intel_display() macro.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c           | 3 ++-
 drivers/gpu/drm/i915/selftests/intel_uncore.c | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uncore.c 
b/drivers/gpu/drm/i915/intel_uncore.c
index c8e29fd72290..4ccba7c8ffb3 100644
--- 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 41eaa9b7f67d..58bcbdcef563 100644
--- 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;
 
        /*
-- 
2.39.5