Commit c39d3e2d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/irq: move check for HAS_HOTPLUG() inside i9xx_hpd_irq_ack() 



We want to avoid using the display dependent HAS_HOTPLUG() in generic
irq code. Since the enabling of I915_DISPLAY_PORT_INTERRUPT depends on
HAS_HOTPLUG() to begin with, we don't really expect to get the irqs for
!HAS_HOTPLUG(). At least in theory, checking for HAS_HOTPLUG() inside
i9xx_hpd_irq_ack() should not have any impact.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/2f97c077e67667bf420196c7381553d5286da958.1758637773.git.jani.nikula@intel.com


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

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

+3 −0
Original line number Diff line number Diff line
@@ -420,6 +420,9 @@ u32 i9xx_hpd_irq_ack(struct intel_display *display) 
	u32 hotplug_status = 0, hotplug_status_mask;

	int i;



	if (!HAS_HOTPLUG(display))

		return 0;



	if (display->platform.g4x ||

	    display->platform.valleyview || display->platform.cherryview)

		hotplug_status_mask = HOTPLUG_INT_STATUS_G4X |

drivers/gpu/drm/i915/i915_irq.c

+1 −2
Original line number Diff line number Diff line
@@ -931,8 +931,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) 


		ret = IRQ_HANDLED;



		if (HAS_HOTPLUG(display) &&

		    iir & I915_DISPLAY_PORT_INTERRUPT)

		if (iir & I915_DISPLAY_PORT_INTERRUPT)

			hotplug_status = i9xx_hpd_irq_ack(display);



		/* Call regardless, as some status bits might not be