[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Use bus_dmamem_map inste...

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

details:   https://anonhg.NetBSD.org/src/rev/87d6962de9da
branches:  trunk
changeset: 835000:87d6962de9da
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:16:40 2018 +0000

description:
Use bus_dmamem_map instead of kmap(sg_page(...)).

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c |  29 ++++++++++++-
 1 files changed, 27 insertions(+), 2 deletions(-)

diffs (78 lines):

diff -r 4febbb0ac977 -r 87d6962de9da sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c       Mon Aug 27 07:16:31 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c       Mon Aug 27 07:16:40 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_render_state.c,v 1.2 2018/08/27 04:58:23 riastradh Exp $      */
+/*     $NetBSD: i915_gem_render_state.c,v 1.3 2018/08/27 07:16:40 riastradh Exp $      */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_render_state.c,v 1.2 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_render_state.c,v 1.3 2018/08/27 07:16:40 riastradh Exp $");
 
 #include "i915_drv.h"
 #include "intel_renderstate.h"
@@ -100,7 +100,11 @@
 {
        const struct intel_renderstate_rodata *rodata = so->rodata;
        unsigned int i = 0, reloc_index = 0;
+#ifdef __NetBSD__
+       void *kva;
+#else
        struct page *page;
+#endif
        u32 *d;
        int ret;
 
@@ -108,8 +112,17 @@
        if (ret)
                return ret;
 
+#ifdef __NetBSD__
+       /* XXX errno NetBSD->Linux */
+       ret = -bus_dmamem_map(so->obj->base.dev->dmat, so->obj->pages,
+           so->obj->igo_nsegs, PAGE_SIZE, &kva, BUS_DMA_WAITOK);
+       if (ret)
+               return ret;
+       d = kva;
+#else
        page = sg_page(so->obj->pages->sgl);
        d = kmap(page);
+#endif
 
        while (i < rodata->batch_items) {
                u32 s = rodata->batch[i];
@@ -146,9 +159,17 @@
         * Since we are sending length, we need to strictly conform to
         * all requirements. For Gen2 this must be a multiple of 8.
         */
+#ifdef __NetBSD__              /* XXX ALIGN means something else.  */
+       so->aux_batch_size = round_up(so->aux_batch_size, 8);
+#else
        so->aux_batch_size = ALIGN(so->aux_batch_size, 8);
+#endif
 
+#ifdef __NetBSD__
+       bus_dmamem_unmap(so->obj->base.dev->dmat, kva, PAGE_SIZE);
+#else
        kunmap(page);
+#endif
 
        ret = i915_gem_object_set_to_gtt_domain(so->obj, false);
        if (ret)
@@ -162,7 +183,11 @@
        return 0;
 
 err_out:
+#ifdef __NetBSD__
+       bus_dmamem_unmap(so->obj->base.dev->dmat, kva, PAGE_SIZE);
+#else
        kunmap(page);
+#endif
        return ret;
 }