summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-12-09 00:49:46 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-12-09 00:49:46 -0800
commit9afda7aa0162a975b1892d0bbe5b6490061f8620 (patch)
tree15d972511efaf89ce4653ca93859856ca515fd17
parentUpdated to 5.15.6 (diff)
downloadlinux-9afda7aa0162a975b1892d0bbe5b6490061f8620.tar.xz
Updated to 5.15.7
-rw-r--r--0007-Revert-drm-i915-Implement-Wa_1508744258.patch47
-rw-r--r--PKGBUILD7
2 files changed, 2 insertions, 52 deletions
diff --git a/0007-Revert-drm-i915-Implement-Wa_1508744258.patch b/0007-Revert-drm-i915-Implement-Wa_1508744258.patch
deleted file mode 100644
index 5517ef5..0000000
--- a/0007-Revert-drm-i915-Implement-Wa_1508744258.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2b3efb722d72940a61adb5898d92d8ebacd9e3a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
-Date: Fri, 19 Nov 2021 06:09:30 -0800
-Subject: [PATCH 7/8] Revert "drm/i915: Implement Wa_1508744258"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This workarounds are causing hangs, because I missed the fact that it
-needs to be enabled for all cases and disabled when doing a resolve
-pass.
-
-So KMD only needs to whitelist it and UMD will be the one setting it
-on per case.
-
-This reverts commit 28ec02c9cbebf3feeaf21a59df9dfbc02bda3362.
-
-Fixes: https://gitlab.freedesktop.org/drm/intel/-/issues/4145
-Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
-Fixes: 28ec02c9cbeb ("drm/i915: Implement Wa_1508744258")
-Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>
-For: https://bugs.archlinux.org/task/72752
----
- drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
-index aae609d7d85d..6b5ab19a2ada 100644
---- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
-+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
-@@ -621,13 +621,6 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
- FF_MODE2_GS_TIMER_MASK,
- FF_MODE2_GS_TIMER_224,
- 0, false);
--
-- /*
-- * Wa_14012131227:dg1
-- * Wa_1508744258:tgl,rkl,dg1,adl-s,adl-p
-- */
-- wa_masked_en(wal, GEN7_COMMON_SLICE_CHICKEN1,
-- GEN9_RHWO_OPTIMIZATION_DISABLE);
- }
-
- static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,
---
-2.33.1
-
diff --git a/PKGBUILD b/PKGBUILD
index ad81f43..336922d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _custom=0
pkgbase=linux
_supver=5
_majver=15
-_minver=6
+_minver=7
_gccpatchver='20211114'
_gccpatchker='5.15+'
if [ "$_minver" == "0" ]; then
@@ -47,7 +47,6 @@ source=(
0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
0006-lg-laptop-Recognize-more-models.patch
- 0007-Revert-drm-i915-Implement-Wa_1508744258.patch
kernel_compiler_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/${_gccpatchver}.tar.gz
ath9k-regdom-hack.patch
raid6-default-algo.patch
@@ -57,7 +56,7 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1064b77926f86d93c7035634db8ba8f6c1e2d957ff749b34e218c565c7'
+b2sums=('66894c8d2001bccfbfc9d31d2f68fef64826c088676df94136a4dcf158962c146cc668490d342c2e8bf914903be69f5b4fbc1cd264b844a8d966059bf34fac6f'
'SKIP'
'd542fc258c4381355fe44f604c8656d4b266df5709fd8fb63c63486935f0c6b1220df08802d497fa9371c9011479e3ca33c23d8514a71374d862648380344f9c'
'f1e7205c4033abe680c5ddc9542a677f27b725f2d8b9b84133d877b1d60d5c373ed2873445202bdd7e15b6f56c96ffa2427fc1e36b485c25ae69907f486c4603'
@@ -66,7 +65,6 @@ b2sums=('dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1
'087676835d15d3c13da86a37e2de922a461b973931ecf29f1ddefddfa23df3ea045799db1f62aa3be70d57df4436ae5fe4f2ef99c05258a1aa9944c00724cdc5'
'b693e06413968585a18b1d504768433420588764485eee298b70d5ca622197d7d134bf42d4f517b0f8367a188f90580825d1c3f8a55099ec69fc14be66465f16'
'ac8502cd579880d05108aad23b844633a67ff9d8b83b63d2a0fc7fa1031aa3b09ee52989415cc27a0ef13f8a9e3f035bf27b33ed1dafc5132c4edc371800c061'
- 'c5928b74720dc96865b2b94e35ee790cd96e3197abe1eb2140d79bc931b433564b80155c4129fc6d9e4215b44a620e78a3fdb1e92677e689c503b0157b43960b'
'534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d'
'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a')
@@ -94,7 +92,6 @@ prepare() {
patch -p1 -i ../0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
patch -p1 -i ../0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
patch -p1 -i ../0006-lg-laptop-Recognize-more-models.patch
- patch -p1 -i ../0007-Revert-drm-i915-Implement-Wa_1508744258.patch
# graysky gcc patch