UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/vmwgfx: Fix the lifetime of the bo cursor memory 

[ Upstream commit 9a9e8a7159ca09af9b1a300a6c8e8b6ff7501c76 ]

The cleanup can be dispatched while the atomic update is still active,
which means that the memory acquired in the atomic update needs to
not be invalidated by the cleanup. The buffer objects in vmw_plane_state
instead of using the builtin map_and_cache were trying to handle
the lifetime of the mapped memory themselves, leading to crashes.

Use the map_and_cache instead of trying to manage the lifetime of the
buffer objects held by the vmw_plane_state.

Fixes kernel oops'es in IGT's kms_cursor_legacy forked-bo.

Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Fixes: bb6780aa5a ("drm/vmwgfx: Diff cursors when using cmds")
Cc: <stable@vger.kernel.org> # v6.2+
Reviewed-by: Martin Krastev <martin.krastev@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240126200804.732454-6-zack.rusin@broadcom.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zack Rusin 2024-01-26 15:08:04 -05:00 committed by Greg Kroah-Hartman
parent 2160ad6861
commit 86cb706a40
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
View File

@ -184,13 +184,12 @@ static u32 vmw_du_cursor_mob_size(u32 w, u32 h)
*/ */
static u32 *vmw_du_cursor_plane_acquire_image(struct vmw_plane_state *vps) static u32 *vmw_du_cursor_plane_acquire_image(struct vmw_plane_state *vps)
{ {
bool is_iomem;
if (vps->surf) { if (vps->surf) {
if (vps->surf_mapped) if (vps->surf_mapped)
return vmw_bo_map_and_cache(vps->surf->res.guest_memory_bo); return vmw_bo_map_and_cache(vps->surf->res.guest_memory_bo);
return vps->surf->snooper.image; return vps->surf->snooper.image;
} else if (vps->bo) } else if (vps->bo)
return ttm_kmap_obj_virtual(&vps->bo->map, &is_iomem); return vmw_bo_map_and_cache(vps->bo);
return NULL; return NULL;
} }
@ -652,22 +651,12 @@ vmw_du_cursor_plane_cleanup_fb(struct drm_plane *plane,
{ {
struct vmw_cursor_plane *vcp = vmw_plane_to_vcp(plane); struct vmw_cursor_plane *vcp = vmw_plane_to_vcp(plane);
struct vmw_plane_state *vps = vmw_plane_state_to_vps(old_state); struct vmw_plane_state *vps = vmw_plane_state_to_vps(old_state);
bool is_iomem;
if (vps->surf_mapped) { if (vps->surf_mapped) {
vmw_bo_unmap(vps->surf->res.guest_memory_bo); vmw_bo_unmap(vps->surf->res.guest_memory_bo);
vps->surf_mapped = false; vps->surf_mapped = false;
} }
if (vps->bo && ttm_kmap_obj_virtual(&vps->bo->map, &is_iomem)) {
const int ret = ttm_bo_reserve(&vps->bo->tbo, true, false, NULL);
if (likely(ret == 0)) {
ttm_bo_kunmap(&vps->bo->map);
ttm_bo_unreserve(&vps->bo->tbo);
}
}
vmw_du_cursor_plane_unmap_cm(vps); vmw_du_cursor_plane_unmap_cm(vps);
vmw_du_put_cursor_mob(vcp, vps); vmw_du_put_cursor_mob(vcp, vps);