Message ID | 20210630095228.6665-3-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: IRQ fixes | expand |
On Wed, Jun 30, 2021 at 11:52:28AM +0200, Thomas Zimmermann wrote: > Remove all references to DRM's IRQ midlayer. i915 uses Linux' interrupt > functions directly. > > v2: > * also remove an outdated comment > * move IRQ fix into separate patch > * update Fixes tag (Daniel) > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: b318b82455bd ("drm/i915: Nuke drm_driver irq vfuncs") > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Cc: <stable@vger.kernel.org> # v5.4+ > --- > drivers/gpu/drm/i915/i915_drv.c | 1 - > drivers/gpu/drm/i915/i915_irq.c | 5 ----- > 2 files changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 850b499c71c8..73de45472f60 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -42,7 +42,6 @@ > #include <drm/drm_aperture.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_ioctl.h> > -#include <drm/drm_irq.h> > #include <drm/drm_managed.h> > #include <drm/drm_probe_helper.h> > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 2203dca19895..1d4c683c9de9 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -33,7 +33,6 @@ > #include <linux/sysrq.h> > > #include <drm/drm_drv.h> > -#include <drm/drm_irq.h> > > #include "display/intel_de.h" > #include "display/intel_display_types.h" > @@ -4564,10 +4563,6 @@ void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv) > > bool intel_irqs_enabled(struct drm_i915_private *dev_priv) > { > - /* > - * We only use drm_irq_uninstall() at unload and VT switch, so > - * this is the only thing we need to check. > - */ > return dev_priv->runtime_pm.irqs_enabled; > } > > -- > 2.32.0 > How is this a stable-kernel-related fix? thanks, greg k-h
Hi Am 30.06.21 um 12:06 schrieb Greg KH: > On Wed, Jun 30, 2021 at 11:52:28AM +0200, Thomas Zimmermann wrote: >> Remove all references to DRM's IRQ midlayer. i915 uses Linux' interrupt >> functions directly. >> >> v2: >> * also remove an outdated comment >> * move IRQ fix into separate patch >> * update Fixes tag (Daniel) >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Fixes: b318b82455bd ("drm/i915: Nuke drm_driver irq vfuncs") >> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Jani Nikula <jani.nikula@linux.intel.com> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Cc: intel-gfx@lists.freedesktop.org >> Cc: <stable@vger.kernel.org> # v5.4+ >> --- >> drivers/gpu/drm/i915/i915_drv.c | 1 - >> drivers/gpu/drm/i915/i915_irq.c | 5 ----- >> 2 files changed, 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c >> index 850b499c71c8..73de45472f60 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.c >> +++ b/drivers/gpu/drm/i915/i915_drv.c >> @@ -42,7 +42,6 @@ >> #include <drm/drm_aperture.h> >> #include <drm/drm_atomic_helper.h> >> #include <drm/drm_ioctl.h> >> -#include <drm/drm_irq.h> >> #include <drm/drm_managed.h> >> #include <drm/drm_probe_helper.h> >> >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c >> index 2203dca19895..1d4c683c9de9 100644 >> --- a/drivers/gpu/drm/i915/i915_irq.c >> +++ b/drivers/gpu/drm/i915/i915_irq.c >> @@ -33,7 +33,6 @@ >> #include <linux/sysrq.h> >> >> #include <drm/drm_drv.h> >> -#include <drm/drm_irq.h> >> >> #include "display/intel_de.h" >> #include "display/intel_display_types.h" >> @@ -4564,10 +4563,6 @@ void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv) >> >> bool intel_irqs_enabled(struct drm_i915_private *dev_priv) >> { >> - /* >> - * We only use drm_irq_uninstall() at unload and VT switch, so >> - * this is the only thing we need to check. >> - */ >> return dev_priv->runtime_pm.irqs_enabled; >> } >> >> -- >> 2.32.0 >> > > How is this a stable-kernel-related fix? Sorry, it isn't. I forgot to remove the rsp Cc tag. Best regards Thomas > > thanks, > > greg k-h >
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 850b499c71c8..73de45472f60 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -42,7 +42,6 @@ #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_ioctl.h> -#include <drm/drm_irq.h> #include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2203dca19895..1d4c683c9de9 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -33,7 +33,6 @@ #include <linux/sysrq.h> #include <drm/drm_drv.h> -#include <drm/drm_irq.h> #include "display/intel_de.h" #include "display/intel_display_types.h" @@ -4564,10 +4563,6 @@ void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv) bool intel_irqs_enabled(struct drm_i915_private *dev_priv) { - /* - * We only use drm_irq_uninstall() at unload and VT switch, so - * this is the only thing we need to check. - */ return dev_priv->runtime_pm.irqs_enabled; }
Remove all references to DRM's IRQ midlayer. i915 uses Linux' interrupt functions directly. v2: * also remove an outdated comment * move IRQ fix into separate patch * update Fixes tag (Daniel) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: b318b82455bd ("drm/i915: Nuke drm_driver irq vfuncs") Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-gfx@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.4+ --- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_irq.c | 5 ----- 2 files changed, 6 deletions(-)