diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 4 | ||||
-rw-r--r-- | 0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch | 47 | ||||
-rw-r--r-- | PKGBUILD | 8 |
4 files changed, 10 insertions, 61 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.12.6 + pkgver = 5.12.7 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -12,22 +12,20 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.6.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.6.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.7.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.7.tar.sign source = config source = more-uarches-20210412.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20210412.tar.gz source = http://ck.kolivas.org/patches/5.0/5.12/5.12-ck1/patch-5.12-ck1.xz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - source = 0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = 94a6f2b620a33fa52fabfce5781a7e0cd57ee03e65e823e5f25fc0d0bcaec019f9e955bc78c7799f258273c7e36cc277035d07afe4d4b3036bbe2ff526ce9b85 + b2sums = 7881dceb8a88dfc290ef8e175e31f6b7cba30c1b343883344915acda6b9b20484496511f1d2d9a7e8195621db3b4c93fdc16c1d5be5cb9b685d1d8940800ab58 b2sums = SKIP b2sums = ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746 b2sums = 72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e b2sums = c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3 - b2sums = e43852e13fad5cdf3ce47ed698579bf019ea5c4f2f63191f417e226733b70b984c892bf2fd64bdca89aaa44dfd6b06e01f169bc784d7bf61e6189427e24c8b0a - b2sums = 702170405ba80860ab6500853258021459a440388cff3d3427d85c080089c8c9032baadd7e634e32bb33d20e237476bea5cdb55a40116178fc87cd887b14b9da + b2sums = e1eccb5b6b728e3852ade55dae7a53b8b6bd5f0fb2a330b99e85bfa64abaa430cb714d301ed169df14a1f302a75d952992f0d8fa6ab02fa6716165bdf23b63aa pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index b88a6f2efb04..79dab97ee81a 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 22e3612b3c9305e1010da29ee500a6ad0cc3843f Mon Sep 17 00:00:00 2001 +From f8f830397db175f686669b8b36755a6e5d5c3f03 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. diff --git a/0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch b/0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch deleted file mode 100644 index abd032ecca04..000000000000 --- a/0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch +++ /dev/null @@ -1,47 +0,0 @@ -From de10bb9892a9e075f4489be1495da1d6c8bc6360 Mon Sep 17 00:00:00 2001 -From: Simon Rettberg <simon.rettberg@rz.uni-freiburg.de> -Date: Mon, 26 Apr 2021 16:11:24 +0200 -Subject: [PATCH 2/3] drm/i915/gt: Disable HiZ Raw Stall Optimization on broken - gen7 - -When resetting CACHE_MODE registers, don't enable HiZ Raw Stall -Optimization on Ivybridge GT1 and Baytrail, as it causes severe glitches -when rendering any kind of 3D accelerated content. -This optimization is disabled on these platforms by default according to -official documentation from 01.org. - -Fixes: ef99a60ffd9b ("drm/i915/gt: Clear CACHE_MODE prior to clearing residuals") -BugLink: https://gitlab.freedesktop.org/drm/intel/-/issues/3081 -BugLink: https://gitlab.freedesktop.org/drm/intel/-/issues/3404 -BugLink: https://gitlab.freedesktop.org/drm/intel/-/issues/3071 -Reviewed-by: Manuel Bentele <development@manuel-bentele.de> -Signed-off-by: Simon Rettberg <simon.rettberg@rz.uni-freiburg.de> -Reviewed-by: Dave Airlie <airlied@redhat.com> -Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> -[Rodrigo removed invalid Fixes line] -Link: https://patchwork.freedesktop.org/patch/msgid/20210426161124.2b7fd708@dellnichtsogutkiste -(cherry picked from commit 929b734ad34b717d6a1b8de97f53bb5616040147) -Signed-off-by: Jani Nikula <jani.nikula@intel.com> ---- - drivers/gpu/drm/i915/gt/gen7_renderclear.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c -index de575fdb033f..21f08e53889c 100644 ---- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c -+++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c -@@ -397,7 +397,10 @@ static void emit_batch(struct i915_vma * const vma, - gen7_emit_pipeline_invalidate(&cmds); - batch_add(&cmds, MI_LOAD_REGISTER_IMM(2)); - batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_0_GEN7)); -- batch_add(&cmds, 0xffff0000); -+ batch_add(&cmds, 0xffff0000 | -+ ((IS_IVB_GT1(i915) || IS_VALLEYVIEW(i915)) ? -+ HIZ_RAW_STALL_OPT_DISABLE : -+ 0)); - batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_1)); - batch_add(&cmds, 0xffff0000 | PIXEL_SUBSPAN_COLLECT_OPT_DISABLE); - gen7_emit_pipeline_invalidate(&cmds); --- -2.31.1 - @@ -67,7 +67,7 @@ _subarch= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=1 _ckpatchversion=1 arch=(x86_64) @@ -85,19 +85,17 @@ source=( "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" "http://ck.kolivas.org/patches/5.0/5.12/5.12-ck${_ckpatchversion}/$_ckpatch.xz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-drm-i915-gt-Disable-HiZ-Raw-Stall-Optimization-on-br.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('94a6f2b620a33fa52fabfce5781a7e0cd57ee03e65e823e5f25fc0d0bcaec019f9e955bc78c7799f258273c7e36cc277035d07afe4d4b3036bbe2ff526ce9b85' +b2sums=('7881dceb8a88dfc290ef8e175e31f6b7cba30c1b343883344915acda6b9b20484496511f1d2d9a7e8195621db3b4c93fdc16c1d5be5cb9b685d1d8940800ab58' 'SKIP' 'ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746' '72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e' 'c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3' - 'e43852e13fad5cdf3ce47ed698579bf019ea5c4f2f63191f417e226733b70b984c892bf2fd64bdca89aaa44dfd6b06e01f169bc784d7bf61e6189427e24c8b0a' - '702170405ba80860ab6500853258021459a440388cff3d3427d85c080089c8c9032baadd7e634e32bb33d20e237476bea5cdb55a40116178fc87cd887b14b9da') + 'e1eccb5b6b728e3852ade55dae7a53b8b6bd5f0fb2a330b99e85bfa64abaa430cb714d301ed169df14a1f302a75d952992f0d8fa6ab02fa6716165bdf23b63aa') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |