release 6.12.9
This commit is contained in:
@@ -1,27 +0,0 @@
|
||||
From 6f554b20207f69146c07be3743b115e42f443627 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Fri, 27 Dec 2024 15:08:09 +0100
|
||||
Subject: drm/amdgpu: Add missing statement in resume_phase3
|
||||
|
||||
Fixes: 73dae652dcac776296890da215ee7dec357a1032
|
||||
See: https://gitlab.freedesktop.org/drm/amd/-/issues/3853#note_2714815
|
||||
For: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/101
|
||||
---
|
||||
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
index 29b8346b..cbca5fa7 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
@@ -3723,6 +3723,7 @@ static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev)
|
||||
r = adev->ip_blocks[i].version->funcs->resume(adev);
|
||||
if (r)
|
||||
return r;
|
||||
+ adev->ip_blocks[i].status.hw = true;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
@@ -102,7 +102,7 @@ Contains:
|
||||
|
||||
--- a/mm/vmscan.c
|
||||
+++ b/mm/vmscan.c
|
||||
@@ -6346,7 +6346,7 @@ retry:
|
||||
@@ -6353,7 +6353,7 @@ retry:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ Contains:
|
||||
{
|
||||
struct zone *zone;
|
||||
unsigned long pfmemalloc_reserve = 0;
|
||||
@@ -6375,6 +6375,10 @@ static bool allow_direct_reclaim(pg_data
|
||||
@@ -6382,6 +6382,10 @@ static bool allow_direct_reclaim(pg_data
|
||||
|
||||
wmark_ok = free_pages > pfmemalloc_reserve / 2;
|
||||
|
||||
@@ -122,7 +122,7 @@ Contains:
|
||||
/* kswapd must be awake if processes are being throttled */
|
||||
if (!wmark_ok && waitqueue_active(&pgdat->kswapd_wait)) {
|
||||
if (READ_ONCE(pgdat->kswapd_highest_zoneidx) > ZONE_NORMAL)
|
||||
@@ -6440,7 +6444,7 @@ static bool throttle_direct_reclaim(gfp_
|
||||
@@ -6447,7 +6451,7 @@ static bool throttle_direct_reclaim(gfp_
|
||||
|
||||
/* Throttle based on the first usable node */
|
||||
pgdat = zone->zone_pgdat;
|
||||
@@ -131,7 +131,7 @@ Contains:
|
||||
goto out;
|
||||
break;
|
||||
}
|
||||
@@ -6462,11 +6466,14 @@ static bool throttle_direct_reclaim(gfp_
|
||||
@@ -6469,11 +6473,14 @@ static bool throttle_direct_reclaim(gfp_
|
||||
*/
|
||||
if (!(gfp_mask & __GFP_FS))
|
||||
wait_event_interruptible_timeout(pgdat->pfmemalloc_wait,
|
||||
@@ -148,7 +148,7 @@ Contains:
|
||||
|
||||
if (fatal_signal_pending(current))
|
||||
return true;
|
||||
@@ -6969,14 +6976,14 @@ restart:
|
||||
@@ -6976,14 +6983,14 @@ restart:
|
||||
* able to safely make forward progress. Wake them
|
||||
*/
|
||||
if (waitqueue_active(&pgdat->pfmemalloc_wait) &&
|
||||
|
Reference in New Issue
Block a user