Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:14:55 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_irq.c
Log Message:
Fix up i915_irq.c.
- <linux/hardirq.h> for synchronize_irq
- DRM_IRQ_ARGS
- PRIx64, not %llx, for 64-bit printf
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.13 Mon Aug 27 07:10:05 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Mon Aug 27 07:14:55 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v
#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 @@ out:
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 @@ semaphore_wait_to_signaller_ring(struct
}
}
- 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;
