Module Name: src
Committed By: snj
Date: Thu Feb 11 23:08:41 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_bo.c
nouveau_drm.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1085):
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c: revision 1.6
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h: revision 1.3
provide a ttm-backed set of nouveau_uvm_ops{} in the ttm_bo_driver{}.
fixes NULL pointer derefs inside UVM due to lack of pager ops.
copy the DRM_FILE_PAGE_OFFSET vs !_LP64 workaround.
with these, X starts up on my GTX 440.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h
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/nouveau/nouveau_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.4.4.1 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.4.4.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.4.4.1 Sun Sep 21 17:41:52 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Thu Feb 11 23:08:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bo.c,v 1.4.4.1 2014/09/21 17:41:52 snj Exp $ */
+/* $NetBSD: nouveau_bo.c,v 1.4.4.2 2016/02/11 23:08:41 snj Exp $ */
/*
* Copyright 2007 Dave Airlied
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.4.4.1 2014/09/21 17:41:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.4.4.2 2016/02/11 23:08:41 snj Exp $");
#include <core/engine.h>
#include <linux/swiotlb.h>
@@ -1568,10 +1568,21 @@ nouveau_bo_fence_flush(void *sync_obj)
return 0;
}
+#ifdef __NetBSD__
+static const struct uvm_pagerops nouveau_uvm_ops = {
+ .pgo_reference = &ttm_bo_uvm_reference,
+ .pgo_detach = &ttm_bo_uvm_detach,
+ .pgo_fault = &ttm_bo_uvm_fault,
+};
+#endif
+
struct ttm_bo_driver nouveau_bo_driver = {
.ttm_tt_create = &nouveau_ttm_tt_create,
.ttm_tt_populate = &nouveau_ttm_tt_populate,
.ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,
+#ifdef __NetBSD__
+ .ttm_uvm_ops = &nouveau_uvm_ops,
+#endif
.invalidate_caches = nouveau_bo_invalidate_caches,
.init_mem_type = nouveau_bo_init_mem_type,
.evict_flags = nouveau_bo_evict_flags,
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h:1.1.1.1.4.1 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h:1.1.1.1.4.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h:1.1.1.1.4.1 Sun Sep 21 17:41:52 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h Thu Feb 11 23:08:41 2016
@@ -40,7 +40,11 @@
struct nouveau_channel;
+#ifdef _LP64
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
+#else
+#define DRM_FILE_PAGE_OFFSET (0xa0000000UL >> PAGE_SHIFT)
+#endif
#include "nouveau_fence.h"
#include "nouveau_bios.h"
