Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:23:50 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_lrc.c
Log Message:
bus_space_write_4, not iowrite32.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.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/intel_lrc.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.2 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c Mon Aug 27 07:23:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lrc.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_lrc.c,v 1.3 2018/08/27 07:23:50 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.3 2018/08/27 07:23:50 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/i915_drm.h>
@@ -745,6 +745,15 @@ intel_logical_ring_advance_and_submit(st
static void __wrap_ring_buffer(struct intel_ringbuffer *ringbuf)
{
+#ifdef __NetBSD__
+ bus_size_t tail;
+ int rem = ringbuf->size - ringbuf->tail;
+
+ tail = ringbuf->tail;
+ rem /= 4;
+ while (rem--)
+ bus_space_write_4(ringbuf->bst, ringbuf->bsh, tail++, MI_NOOP);
+#else
uint32_t __iomem *virt;
int rem = ringbuf->size - ringbuf->tail;
@@ -752,6 +761,7 @@ static void __wrap_ring_buffer(struct in
rem /= 4;
while (rem--)
iowrite32(MI_NOOP, virt++);
+#endif
ringbuf->tail = 0;
intel_ring_update_space(ringbuf);
