[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 The bus_dmamap_...

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

details:   https://anonhg.NetBSD.org/src/rev/606541e617a1
branches:  riastradh-drm2
changeset: 788544:606541e617a1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 16:04:09 2013 +0000

description:
The bus_dmamap_load_raw got moved to i915_gem_gtt but not committed.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r f83c64ae4929 -r 606541e617a1 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 16:03:21 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 16:04:09 2013 +0000
@@ -2034,7 +2034,6 @@
 
        /* XXX Maintain dirty flag?  */
 
-       bus_dmamap_unload(dev->dmat, obj->igo_dmamap);
        bus_dmamap_destroy(dev->dmat, obj->igo_dmamap);
        bus_dmamem_unwire_uvm_object(dev->dmat, obj->base.gemo_shm_uao, 0,
            obj->base.size, obj->pages, obj->igo_nsegs);
@@ -2198,12 +2197,6 @@
        if (error)
                goto fail2;
 
-       /* XXX errno NetBSD->Linux */
-       error = -bus_dmamap_load_raw(dev->dmat, obj->igo_dmamap, obj->pages,
-           obj->igo_nsegs, obj->base.size, BUS_DMA_NOWAIT);
-       if (error)
-               goto fail3;
-
        /* XXX Cargo-culted from the Linux code.  */
        if (i915_gem_object_needs_bit17_swizzle(obj))
                i915_gem_object_do_bit_17_swizzle(obj);
@@ -2211,7 +2204,6 @@
        /* Success!  */
        return 0;
 
-fail3: bus_dmamap_destroy(dev->dmat, obj->igo_dmamap);
 fail2: bus_dmamem_unwire_uvm_object(dev->dmat, obj->base.gemo_shm_uao, 0,
            obj->base.size, obj->pages, (obj->base.size / PAGE_SIZE));
 fail1: kfree(obj->pages);