Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:53:12 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_lrc.c
Log Message:
Simplify loop with bus_space_set_region_4
Match the original copypasta in intel_ringbuffer.c.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c:1.7 Mon Aug 27 14:52:56 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c Mon Aug 27 14:53:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lrc.c,v 1.7 2018/08/27 14:52:56 riastradh Exp $ */
+/* $NetBSD: intel_lrc.c,v 1.8 2018/08/27 14:53:12 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.7 2018/08/27 14:52:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.8 2018/08/27 14:53:12 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/i915_drm.h>
@@ -745,18 +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;
- for (; rem --> 0; tail += 4)
- bus_space_write_4(ringbuf->bst, ringbuf->bsh, tail, MI_NOOP);
-#else
+#ifndef __NetBSD__
uint32_t __iomem *virt;
+#endif
int rem = ringbuf->size - ringbuf->tail;
+#ifdef __NetBSD__
+ bus_space_set_region_4(ringbuf->bst, ringbuf->bsh, ringbuf->tail,
+ MI_NOOP, rem/4);
+#else
virt = ringbuf->virtual_start + ringbuf->tail;
rem /= 4;
while (rem--)
