Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:57:33 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
Don't call TTM functions that were removed, try replacements
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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.23 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.23 Sun Dec 19 09:57:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sun Dec 19 09:57:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.23 2021/12/19 09:57:25 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.24 2021/12/19 09:57:33 riastradh Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.23 2021/12/19 09:57:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.24 2021/12/19 09:57:33 riastradh Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -1646,7 +1646,6 @@ static void ttm_bo_global_release(void)
goto out;
#ifdef __NetBSD__
- ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink);
BUG_ON(glob->dummy_read_page != NULL);
spin_lock_destroy(&glob->lru_lock);
mutex_destroy(&ttm_global_mutex);
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.16 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.17
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.16 Sun Dec 19 09:57:17 2021
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sun Dec 19 09:57:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.16 2021/12/19 09:57:17 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.17 2021/12/19 09:57:33 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.16 2021/12/19 09:57:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.17 2021/12/19 09:57:33 riastradh Exp $");
#include <sys/types.h>
@@ -110,7 +110,9 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
* it, and start over.
*/
uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
- (void)ttm_bo_wait_unreserved(bo);
+ if (!dma_resv_lock_interruptible(bo->base.resv, NULL))
+ dma_resv_unlock(bo->base.resv);
+
return ERESTART;
}
