[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix up i915_irq.c.

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

details:   https://anonhg.NetBSD.org/src/rev/aaa5ee0b897c
branches:  trunk
changeset: 992608:aaa5ee0b897c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:14:55 2018 +0000

description:
Fix up i915_irq.c.

- <linux/hardirq.h> for synchronize_irq
- DRM_IRQ_ARGS
- PRIx64, not %llx, for 64-bit printf

diffstat:

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

diffs (44 lines):

diff -r ea78529e2e9f -r aaa5ee0b897c sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Mon Aug 27 07:14:42 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Mon Aug 27 07:14:55 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_irq.c,v 1.13 2018/08/27 07:10:05 riastradh Exp $  */
+/*     $NetBSD: i915_irq.c,v 1.14 2018/08/27 07:14:55 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.13 2018/08/27 07:10:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.14 2018/08/27 07:14:55 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -37,6 +37,7 @@
 #include <sys/cdefs.h>
 #endif
 
+#include <linux/hardirq.h>
 #include <linux/printk.h>
 #include <linux/sysrq.h>
 #include <linux/slab.h>
@@ -1811,7 +1812,7 @@
        return ret;
 }
 
-static irqreturn_t cherryview_irq_handler(int irq, void *arg)
+static irqreturn_t cherryview_irq_handler(DRM_IRQ_ARGS)
 {
        struct drm_device *dev = arg;
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2839,7 +2840,7 @@
                }
        }
 
-       DRM_ERROR("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n",
+       DRM_ERROR("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016"PRIx64"\n",
                  ring->id, ipehr, offset);
 
        return NULL;