Module Name: src
Committed By: martin
Date: Fri Aug 4 13:30:57 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt [netbsd-10]: intel_ggtt.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #307):
sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c: revision 1.16
i915: Fail gracefully, don't panic, with unsupported ggtt views.
Workaround for part of PR kern/56648.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.4.1 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.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/i915/gt/intel_ggtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.15 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.15.4.1
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.15 Sun Dec 19 12:35:13 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c Fri Aug 4 13:30:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ggtt.c,v 1.15 2021/12/19 12:35:13 riastradh Exp $ */
+/* $NetBSD: intel_ggtt.c,v 1.15.4.1 2023/08/04 13:30:57 martin Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ggtt.c,v 1.15 2021/12/19 12:35:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ggtt.c,v 1.15.4.1 2023/08/04 13:30:57 martin Exp $");
#include <linux/stop_machine.h>
@@ -1772,17 +1772,23 @@ i915_get_ggtt_vma_pages(struct i915_vma
vma->pages = vma->obj->mm.pages;
return 0;
-#ifndef __NetBSD__
case I915_GGTT_VIEW_ROTATED:
+#ifdef __NetBSD__
+ vma->pages = ERR_PTR(-ENODEV);
+#else
vma->pages =
intel_rotate_pages(&vma->ggtt_view.rotated, vma->obj);
+#endif
break;
case I915_GGTT_VIEW_REMAPPED:
+#ifdef __NetBSD__
+ vma->pages = ERR_PTR(-ENODEV);
+#else
vma->pages =
intel_remap_pages(&vma->ggtt_view.remapped, vma->obj);
- break;
#endif
+ break;
case I915_GGTT_VIEW_PARTIAL:
vma->pages = intel_partial_pages(&vma->ggtt_view, vma->obj);
