Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:32:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_irq.c
Log Message:
Undo harmful local diffs
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.22 Sun Dec 19 01:43:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Sun Dec 19 11:32:44 2021
@@ -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 intel_get_hpd_pins(struct dr
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 gmbus_irq_handler(struct drm
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 @@ static void bxt_hpd_irq_handler(struct d
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;
