[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix up some borken merges.

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

details:   https://anonhg.NetBSD.org/src/rev/dc78584b8594
branches:  trunk
changeset: 835067:dc78584b8594
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:29:50 2018 +0000

description:
Fix up some borken merges.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c |  30 +++++++++---------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (112 lines):

diff -r 3d31ce671fe2 -r dc78584b8594 sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c    Mon Aug 27 07:29:37 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c    Mon Aug 27 07:29:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_ringbuffer.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $   */
+/*     $NetBSD: intel_ringbuffer.c,v 1.8 2018/08/27 07:29:50 riastradh Exp $   */
 
 /*
  * Copyright © 2008-2010 Intel Corporation
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.8 2018/08/27 07:29:50 riastradh Exp $");
 
 #include <asm/param.h>
 #include <drm/drmP.h>
@@ -670,7 +670,12 @@
                return;
 
        if (INTEL_INFO(dev)->gen >= 5) {
+#ifdef __NetBSD__
+               kunmap(container_of(TAILQ_FIRST(&ring->scratch.obj->pageq),
+                       struct page, p_vmp));
+#else
                kunmap(sg_page(ring->scratch.obj->pages->sgl));
+#endif
                i915_gem_object_ggtt_unpin(ring->scratch.obj);
        }
 
@@ -703,7 +708,7 @@
        ring->scratch.gtt_offset = i915_gem_obj_ggtt_offset(ring->scratch.obj);
 #ifdef __NetBSD__
        ring->scratch.cpu_page =
-           kmap(container_of(TAILQ_FIRST(&ring->scratch.obj->igo_pageq),
+           kmap(container_of(TAILQ_FIRST(&ring->scratch.obj->pageq),
                    struct page, p_vmp));
 #else
        ring->scratch.cpu_page = kmap(sg_page(ring->scratch.obj->pages->sgl));
@@ -1954,7 +1959,7 @@
                return;
 
 #ifdef __NetBSD__
-       kunmap(container_of(TAILQ_FIRST(&obj->igo_pageq), struct page, p_vmp));
+       kunmap(container_of(TAILQ_FIRST(&obj->pageq), struct page, p_vmp));
 #else
        kunmap(sg_page(obj->pages->sgl));
 #endif
@@ -2007,15 +2012,10 @@
        ring->status_page.gfx_addr = i915_gem_obj_ggtt_offset(obj);
 #ifdef __NetBSD__
        ring->status_page.page_addr =
-           kmap(container_of(TAILQ_FIRST(&obj->igo_pageq), struct page,
-                   p_vmp));
+           kmap(container_of(TAILQ_FIRST(&obj->pageq), struct page, p_vmp));
 #else
        ring->status_page.page_addr = kmap(sg_page(obj->pages->sgl));
 #endif
-       if (ring->status_page.page_addr == NULL) {
-               ret = -ENOMEM;
-               goto err_unpin;
-       }
        memset(ring->status_page.page_addr, 0, PAGE_SIZE);
 
        DRM_DEBUG_DRIVER("%s hws offset: 0x%08x\n",
@@ -2047,8 +2047,8 @@
        bus_space_unmap(ringbuf->bst, ringbuf->bsh, ringbuf->size);
 #else
        iounmap(ringbuf->virtual_start);
+       ringbuf->virtual_start = NULL;
 #endif
-       ringbuf->virtual_start = NULL;
        i915_gem_object_ggtt_unpin(ringbuf->obj);
 }
 
@@ -2072,7 +2072,7 @@
 #ifdef __NetBSD__
        /* XXX errno NetBSD->Linux */
        ringbuf->bst = dev_priv->dev->pdev->pd_pa.pa_memt;
-       ret = -bus_space_map(ring->bst, (dev_priv->gtt.mappable_base +
+       ret = -bus_space_map(ringbuf->bst, (dev_priv->gtt.mappable_base +
                i915_gem_obj_ggtt_offset(obj)),
            ringbuf->size, BUS_SPACE_MAP_PREFETCHABLE, &ringbuf->bsh);
        if (ret) {
@@ -2238,6 +2238,7 @@
 
        if (ring->cleanup)
                ring->cleanup(ring);
+
        if (I915_NEED_GFX_HWS(ring->dev)) {
                cleanup_status_page(ring);
        } else {
@@ -2292,8 +2293,8 @@
        int rem = ringbuf->size - ringbuf->tail;
 
 #ifdef __NetBSD__
-       bus_space_set_region_4(ring->bst, ring->bsh, ring->tail, MI_NOOP,
-           rem/4);
+       bus_space_set_region_4(ringbuf->bst, ringbuf->bsh, ringbuf->tail,
+           MI_NOOP, rem/4);
 #else
        virt = ringbuf->virtual_start + ringbuf->tail;
        rem /= 4;
@@ -2845,7 +2846,6 @@
                ret = intel_init_pipe_control(ring);
                if (ret)
                        return ret;
-               }
        }
 
        return 0;