[src/trunk]: src/sys/external/bsd/drm2/ttm Mark the state as unbound a bit ea...

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

details:   https://anonhg.NetBSD.org/src/rev/9ddb0308b21a
branches:  trunk
changeset: 351989:9ddb0308b21a
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Mar 09 07:42:36 2017 +0000

description:
Mark the state as unbound a bit earlier, to avoid triggering an assert in
the fail1 error path.

PR kern/52048: radeondrmkms: ttm->state == tt_unbound assertion

diffstat:

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

diffs (38 lines):

diff -r 07a07caa4311 -r 9ddb0308b21a sys/external/bsd/drm2/ttm/ttm_bus_dma.c
--- a/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Thu Mar 09 06:21:54 2017 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Thu Mar 09 07:42:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bus_dma.c,v 1.2 2016/04/24 04:26:12 riastradh Exp $        */
+/*     $NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya 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.2 2016/04/24 04:26:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya Exp $");
 
 #include <sys/bus.h>
 
@@ -78,6 +78,9 @@
        if (ret)
                goto fail0;
 
+       /* Mark it populated but unbound.  */
+       ttm_dma->ttm.state = tt_unbound;
+
        /* Load the DMA map.  */
        /* XXX errno NetBSD->Linux */
        ret = -bus_dmamap_load_pglist(ttm_dma->ttm.bdev->dmat,
@@ -89,9 +92,6 @@
        /* Mark it wired.  */
        ttm_dma->ttm.page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
 
-       /* Mark it populated but unbound.  */
-       ttm_dma->ttm.state = tt_unbound;
-
        /* Success!  */
        return 0;