linux54-tkg: Fix: drm/i915: prevent direct writeback from the shrinker

Proposed initially as a community patch - https://github.com/Frogging-Family/community-patches/pull/106

Fixes https://github.com/Frogging-Family/community-patches/pull/106
This commit is contained in:
Tk-Glitch
2022-03-31 19:02:43 +02:00
parent ff56abf7d9
commit 1222434e4d
2 changed files with 17 additions and 1 deletions

View File

@@ -98,6 +98,7 @@ case $_basever in
0009-glitched-bmq.patch 0009-glitched-bmq.patch
0009-bmq_v5.4-r2.patch 0009-bmq_v5.4-r2.patch
0012-linux-hardened.patch 0012-linux-hardened.patch
0012-misc-additions.patch
) )
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'cd978b0ca835f0c9fec86f70cdfcc8e103653868e4b44996dc02ab49d6783df0' 'cd978b0ca835f0c9fec86f70cdfcc8e103653868e4b44996dc02ab49d6783df0'
@@ -120,7 +121,8 @@ case $_basever in
'2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d' '2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d'
'3832f828a9f402b153fc9a6829c5a4eaf6091804bcda3a0423c8e1b57e26420d' '3832f828a9f402b153fc9a6829c5a4eaf6091804bcda3a0423c8e1b57e26420d'
'c98befca824f761260466410a1dd94d2b9be6f7211b5daefcfc0f3a102bbdc81' 'c98befca824f761260466410a1dd94d2b9be6f7211b5daefcfc0f3a102bbdc81'
'aeb31404c26ee898d007b1f66cb9572c9884ad8eca14edc4587d68f6cba6de46') 'aeb31404c26ee898d007b1f66cb9572c9884ad8eca14edc4587d68f6cba6de46'
'87f8ba249620628ad493ed5d65da9811bf635411a70aaa49ed1d97438ebf77be')
;; ;;
57) 57)
source=("$kernel_site" source=("$kernel_site"

View File

@@ -0,0 +1,14 @@
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index edd21d14e64f..793bd586b80b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -357,8 +357,7 @@ i915_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)
sc->nr_to_scan,
&sc->nr_scanned,
I915_SHRINK_BOUND |
- I915_SHRINK_UNBOUND |
- I915_SHRINK_WRITEBACK);
+ I915_SHRINK_UNBOUND);
if (sc->nr_scanned < sc->nr_to_scan && current_is_kswapd()) {
intel_wakeref_t wakeref;