Commit 21ecdf45 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: pass display to HAS_PCH_*() macros 



Convert some leftover i915 usages to struct intel_display.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/c521c9fa8b7d2c9a04d472f6c541a41822f76327.1754499174.git.jani.nikula@intel.com


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

drivers/gpu/drm/i915/display/intel_display_irq.c

+3 −6
Original line number Diff line number Diff line
@@ -1990,20 +1990,17 @@ void vlv_display_irq_postinstall(struct intel_display *display) 


void ibx_display_irq_reset(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	if (HAS_PCH_NOP(i915))

	if (HAS_PCH_NOP(display))

		return;



	gen2_irq_reset(to_intel_uncore(display->drm), SDE_IRQ_REGS);



	if (HAS_PCH_CPT(i915) || HAS_PCH_LPT(i915))

	if (HAS_PCH_CPT(display) || HAS_PCH_LPT(display))

		intel_de_write(display, SERR_INT, 0xffffffff);

}



void gen8_display_irq_reset(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);

	enum pipe pipe;



	if (!HAS_DISPLAY(display))
@@ -2020,7 +2017,7 @@ void gen8_display_irq_reset(struct intel_display *display) 
	intel_display_irq_regs_reset(display, GEN8_DE_PORT_IRQ_REGS);

	intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);



	if (HAS_PCH_SPLIT(i915))

	if (HAS_PCH_SPLIT(display))

		ibx_display_irq_reset(display);

}