Commit f8889a24 authored by Michel Dänzer's avatar Michel Dänzer Committed by Sasha Levin

drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags

[ Upstream commit ce4b4f22 ]

We were accidentally only overriding the first VRAM placement. For BOs
with the RADEON_GEM_NO_CPU_ACCESS flag set,
radeon_ttm_placement_from_domain creates a second VRAM placment with
fpfn == 0. If VRAM is almost full, the first VRAM placement with
fpfn > 0 may not work, but the second one with fpfn == 0 always will
(the BO's current location trivially satisfies it). Because "moving"
the BO to its current location puts it back on the LRU list, this
results in an infinite loop.

Fixes: 2a85aedd ("drm/radeon: Try evicting from CPU accessible to
                      inaccessible VRAM first")
Reported-by: default avatarZachary Michaels <zmichaels@oblong.com>
Reported-and-Tested-by: default avatarJulien Isorce <jisorce@oblong.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 848f9459
...@@ -213,8 +213,8 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo, ...@@ -213,8 +213,8 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
rbo->placement.num_busy_placement = 0; rbo->placement.num_busy_placement = 0;
for (i = 0; i < rbo->placement.num_placement; i++) { for (i = 0; i < rbo->placement.num_placement; i++) {
if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) { if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) {
if (rbo->placements[0].fpfn < fpfn) if (rbo->placements[i].fpfn < fpfn)
rbo->placements[0].fpfn = fpfn; rbo->placements[i].fpfn = fpfn;
} else { } else {
rbo->placement.busy_placement = rbo->placement.busy_placement =
&rbo->placements[i]; &rbo->placements[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment