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

drm/vmwgfx: move null mem checks outside move notifies

Browse Source 
Both fns checked mem == NULL, just move the check outside.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201006000644.1005758-3-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-10-06 10:06:41 +10:00
parent 881c411795
commit 279a301021
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
View File

@ -1192,9 +1192,6 @@ void vmw_bo_move_notify(struct ttm_buffer_object *bo,
{ {
struct vmw_buffer_object *vbo; struct vmw_buffer_object *vbo;
if (mem == NULL)
return;
/* Make sure @bo is embedded in a struct vmw_buffer_object? */ /* Make sure @bo is embedded in a struct vmw_buffer_object? */
if (bo->destroy != vmw_bo_bo_free && if (bo->destroy != vmw_bo_bo_free &&
bo->destroy != vmw_user_bo_destroy) bo->destroy != vmw_user_bo_destroy)

2
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
View File

@ -867,7 +867,7 @@ void vmw_query_move_notify(struct ttm_buffer_object *bo,
mutex_lock(&dev_priv->binding_mutex); mutex_lock(&dev_priv->binding_mutex);
dx_query_mob = container_of(bo, struct vmw_buffer_object, base); dx_query_mob = container_of(bo, struct vmw_buffer_object, base);
if (mem == NULL || !dx_query_mob || !dx_query_mob->dx_query_ctx) { if (!dx_query_mob || !dx_query_mob->dx_query_ctx) {
mutex_unlock(&dev_priv->binding_mutex); mutex_unlock(&dev_priv->binding_mutex);
return; return;
} }

2
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
View File

@ -707,6 +707,8 @@ static void vmw_move_notify(struct ttm_buffer_object *bo,
bool evict, bool evict,
struct ttm_resource *mem) struct ttm_resource *mem)
{ {
if (!mem)
return;
vmw_bo_move_notify(bo, mem); vmw_bo_move_notify(bo, mem);
vmw_query_move_notify(bo, mem); vmw_query_move_notify(bo, mem);
} }