Module Name: src
Committed By: martin
Date: Mon Jan 15 14:13:40 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-10]: i915_pci.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #553):
sys/external/bsd/drm2/dist/drm/i915/i915_pci.c: revision 1.5
i915: Backport change to downgrade gen7/vlv to aliasing-ppggtt.
PR kern/57268
commit 4fbe112a569526e46fa2accb5763c069f78cb431
Author: Chris Wilson <chris%chris-wilson.co.uk@localhost>
Date: Mon Feb 24 10:11:20 2020 +0000
drm/i915/gtt: Downgrade gen7 (ivb, byt, hsw) back to aliasing-ppgtt
Full-ppgtt on gen7 is proving to be highly unstable and not robust.
Closes: <a rel="nofollow"
href="https://gitlab.freedesktop.org/drm/intel/issues/694";>https://gitlab.freedesktop.org/drm/intel/issues/694</a>
Fixes: 3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
Signed-off-by: Chris Wilson <chris%chris-wilson.co.uk@localhost>
Cc: Joonas Lahtinen <joonas.lahtinen%linux.intel.com@localhost>
Cc: Rodrigo Vivi <rodrigo.vivi%intel.com@localhost>
Cc: Jani Nikula <jani.nikula%intel.com@localhost>
Cc: Dave Airlie <airlied%redhat.com@localhost>
Acked-by: Rodrigo Vivi <rodrigo.vivi%intel.com@localhost>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200224101120.4024481-1-chris%chris-wilson.co.uk@localhost
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.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/i915_pci.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4.4.1
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4 Sun Dec 19 01:44:49 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c Mon Jan 15 14:13:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.4.4.1 2024/01/15 14:13:39 martin Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.4.4.1 2024/01/15 14:13:39 martin Exp $");
#include <linux/console.h>
#include <linux/vga_switcheroo.h>
@@ -442,7 +442,7 @@ static const struct intel_device_info sn
.has_rc6 = 1, \
.has_rc6p = 1, \
.has_rps = true, \
- .ppgtt_type = INTEL_PPGTT_FULL, \
+ .ppgtt_type = INTEL_PPGTT_ALIASING, \
.ppgtt_size = 31, \
IVB_PIPE_OFFSETS, \
IVB_CURSOR_OFFSETS, \
@@ -499,7 +499,7 @@ static const struct intel_device_info vl
.has_rps = true,
.display.has_gmch = 1,
.display.has_hotplug = 1,
- .ppgtt_type = INTEL_PPGTT_FULL,
+ .ppgtt_type = INTEL_PPGTT_ALIASING,
.ppgtt_size = 31,
.has_snoop = true,
.has_coherent_ggtt = false,
