iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nouveau: reset the bo resource bus info after an eviction

Browse Source 
[ Upstream commit f35c9af45ea7a4b1115b193d84858b14d13517fc ]

Later attempts to refault the bo won't happen and the whole
GPU does to lunch. I think Christian's refactoring of this
code out to the driver broke this not very well tested path.

Fixes: 141b15e59175 ("drm/nouveau: move io_reserve_lru handling into the driver v5")
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240311072037.287905-1-airlied@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dave Airlie 2024-03-11 17:20:37 +10:00 committed by Sasha Levin
parent d23e49f4e4
commit d2034a6b92
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -1194,6 +1194,8 @@ out:
drm_vma_node_unmap(&nvbo->bo.base.vma_node, drm_vma_node_unmap(&nvbo->bo.base.vma_node,
bdev->dev_mapping); bdev->dev_mapping);
nouveau_ttm_io_mem_free_locked(drm, nvbo->bo.resource); nouveau_ttm_io_mem_free_locked(drm, nvbo->bo.resource);
nvbo->bo.resource->bus.offset = 0;
nvbo->bo.resource->bus.addr = NULL;
goto retry; goto retry;
} }