[src/netbsd-8]: src/sys/external/bsd/drm2/ttm Pull up following revision(s) (...

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

details:   https://anonhg.NetBSD.org/src/rev/4af124516823
branches:  netbsd-8
changeset: 852343:4af124516823
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 22 08:08:45 2019 +0000

description:
Pull up following revision(s) (requested by chs in ticket #1237):

        sys/external/bsd/drm2/ttm/ttm_bus_dma.c: revision 1.8

in ttm_bus_dma_populate(), move the clearing of TTM_PAGE_FLAG_SWAPPED to be
earlier to avoid wrongly asserting if bus_dmamap_load_pglist() fails.

diffstat:

 sys/external/bsd/drm2/ttm/ttm_bus_dma.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 1f9c17e8bb47 -r 4af124516823 sys/external/bsd/drm2/ttm/ttm_bus_dma.c
--- a/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Mon Apr 22 08:05:51 2019 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Mon Apr 22 08:08:45 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bus_dma.c,v 1.7 2017/03/09 08:27:18 maya Exp $     */
+/*     $NetBSD: ttm_bus_dma.c,v 1.7.6.1 2019/04/22 08:08:45 martin Exp $       */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.7 2017/03/09 08:27:18 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.7.6.1 2019/04/22 08:08:45 martin Exp $");
 
 #include <sys/bus.h>
 
@@ -70,6 +70,9 @@
        /* Mark it populated but unbound.  */
        ttm_dma->ttm.state = tt_unbound;
 
+       /* Mark it wired.  */
+       ttm_dma->ttm.page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
+
        /* Load the DMA map.  */
        /* XXX errno NetBSD->Linux */
        ret = -bus_dmamap_load_pglist(ttm_dma->ttm.bdev->dmat,
@@ -78,9 +81,6 @@
        if (ret)
                goto fail1;
 
-       /* Mark it wired.  */
-       ttm_dma->ttm.page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
-
        /* Success!  */
        return 0;