]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/i915/audio: drop irq enabled check from LPE audio setup
authorJani Nikula <jani.nikula@intel.com>
Fri, 1 Aug 2025 12:28:32 +0000 (15:28 +0300)
committerJani Nikula <jani.nikula@intel.com>
Fri, 15 Aug 2025 08:30:17 +0000 (11:30 +0300)
There shouldn't be anything requiring irqs to be enabled at the point of
LPE audio setup. Regardless, we've never hit the warning, as irqs are
always enabled at the time LPE audio is initialized. Drop the
superfluous warning, and the dependency on i915_drv.h.

Fix style a bit while at it.

Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://lore.kernel.org/r/20250801122832.249985-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_lpe_audio.c

index 666148a1452290b98fd18331c279dcfe83f38e72..42284e9928f2f83f0a4d4b7c299bae07cb486b9b 100644 (file)
@@ -68,9 +68,9 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
+#include <drm/drm_print.h>
 #include <drm/intel/intel_lpe_audio.h>
 
-#include "i915_drv.h"
 #include "i915_irq.h"
 #include "intel_audio_regs.h"
 #include "intel_de.h"
@@ -170,14 +170,11 @@ static struct irq_chip lpe_audio_irqchip = {
 
 static int lpe_audio_irq_init(struct intel_display *display)
 {
-       struct drm_i915_private *dev_priv = to_i915(display->drm);
        int irq = display->audio.lpe.irq;
 
-       drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
-       irq_set_chip_and_handler_name(irq,
-                               &lpe_audio_irqchip,
-                               handle_simple_irq,
-                               "hdmi_lpe_audio_irq_handler");
+       irq_set_chip_and_handler_name(irq, &lpe_audio_irqchip,
+                                     handle_simple_irq,
+                                     "hdmi_lpe_audio_irq_handler");
 
        return 0;
 }