From 3dd6c11b60d2f1e4082221a8831f91093c4494aa Mon Sep 17 00:00:00 2001

From: Thomas Zimmermann <tzimmermann@suse.de>

Date: Thu, 1 Jul 2021 19:36:18 +0200

Subject: drm/i915: Drop all references to DRM IRQ midlayer

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Git-commit: 3dd6c11b60d2f1e4082221a8831f91093c4494aa

Patch-mainline: v5.14-rc1

References: bsc#1152489

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

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Link: https://patchwork.freedesktop.org/patch/msgid/20210701173618.10718-3-tzimmermann@suse.de

(cherry picked from commit 91b96f0008a2d66d76b525556e4818f5a4a089e4)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/i915/i915_drv.c |    1 -

 drivers/gpu/drm/i915/i915_irq.c |    5 -----

 2 files changed, 6 deletions(-)

--- a/drivers/gpu/drm/i915/i915_drv.c

+++ b/drivers/gpu/drm/i915/i915_drv.c

@@ -42,7 +42,6 @@

 #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>

--- 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_display_types.h"

 #include "display/intel_fifo_underrun.h"

@@ -4187,10 +4186,6 @@ void intel_runtime_pm_enable_interrupts(

 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;

 }