Module Name: src
Committed By: maya
Date: Thu Mar 9 07:42:36 UTC 2017
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bus_dma.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.2 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.3
--- src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.2 Sun Apr 24 04:26:12 2016
+++ src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c Thu Mar 9 07:42:36 2017
@@ -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 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
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 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
/* 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;
