[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Undo harmful local diffs

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc328ad0cd00
branches:  trunk
changeset: 1028632:cc328ad0cd00
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:32:44 2021 +0000

description:
Undo harmful local diffs


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r ae647564f674 -r cc328ad0cd00 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Sun Dec 19 11:32:35 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Sun Dec 19 11:32:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_irq.c,v 1.22 2021/12/19 01:43:51 riastradh Exp $  */
+/*     $NetBSD: i915_irq.c,v 1.23 2021/12/19 11:32:44 riastradh Exp $  */
 
 /* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
  */
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.22 2021/12/19 01:43:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.23 2021/12/19 11:32:44 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -1183,7 +1183,6 @@
 
 static void gmbus_irq_handler(struct drm_i915_private *dev_priv)
 {
-       struct drm_i915_private *dev_priv = dev->dev_private;
 
 #ifdef __NetBSD__
        spin_lock(&dev_priv->gmbus_wait_lock);
@@ -1197,7 +1196,6 @@
 
 static void dp_aux_irq_handler(struct drm_i915_private *dev_priv)
 {
-       struct drm_i915_private *dev_priv = dev->dev_private;
 
 #ifdef __NetBSD__
        spin_lock(&dev_priv->gmbus_wait_lock);
@@ -2143,7 +2141,7 @@
        intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
 }
 
-static irqreturn_t gen11_hpd_irq_handler(DRM_IRQ_ARGS)
+static void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
 {
        u32 pin_mask = 0, long_mask = 0;
        u32 trigger_tc = iir & GEN11_DE_TC_HOTPLUG_MASK;