Module Name: src
Committed By: maya
Date: Thu Mar 9 07:55:23 UTC 2017
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bus_dma.c
Log Message:
Restore unpopulated state on fail1 error path. I shouldn't have committed
it separately.
from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.5
--- src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.4 Thu Mar 9 07:50:50 2017
+++ src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c Thu Mar 9 07:55:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bus_dma.c,v 1.4 2017/03/09 07:50:50 maya Exp $ */
+/* $NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 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.4 2017/03/09 07:50:50 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 maya Exp $");
#include <sys/bus.h>
@@ -86,7 +86,9 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
fail2: __unused
bus_dmamap_unload(ttm_dma->ttm.bdev->dmat, ttm_dma->dma_address);
-fail1: ttm_tt_unwire(&ttm_dma->ttm);
+fail1: KASSERT(ttm->state == tt_unbound);
+ ttm_tt_unwire(&ttm_dma->ttm);
+ ttm->state = tt_unpopulated;
fail0: KASSERT(ret);
return ret;
}
