Module Name: src
Committed By: riastradh
Date: Sat Jul 26 06:34:12 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c
Log Message:
Don't ttm_tt_destroy bo->ttm if bo->destroy will destroy it too.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.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/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.2 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sat Jul 26 06:34:12 2014
@@ -159,7 +159,7 @@ static void ttm_bo_release_list(struct k
BUG_ON(!list_empty(&bo->lru));
BUG_ON(!list_empty(&bo->ddestroy));
- if (bo->ttm)
+ if (bo->destroy == NULL && bo->ttm)
ttm_tt_destroy(bo->ttm);
atomic_dec(&bo->glob->bo_count);
if (bo->resv == &bo->ttm_resv)
