Commit 240e3c64 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/e8cda779e192095dfa35d618f88bf7bfa526ac06.1754499175.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 8d588c01

drivers/gpu/drm/i915/intel_uncore.c

+2 −1
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/i915/selftests/intel_uncore.c

+5 −3
Original line number Diff line number Diff line
@@ -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;



	/*