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

drm/amdgpu: check context id for context switching (v2)

Browse Source 
check the filp is not robust, and sometimes different contexts may
have same filp value.

v2: check both filp and ctx_id

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Jammy Zhou
2015-05-08 22:18:47 +08:00
committed by Alex Deucher
parent 66b3cf2ab3
commit 72efa7ebde
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
View File

@@ -945,6 +945,7 @@ struct amdgpu_ring {
unsigned next_rptr_offs; unsigned next_rptr_offs;
unsigned fence_offs; unsigned fence_offs;
struct drm_file *current_filp; struct drm_file *current_filp;
unsigned current_ctx;
bool need_ctx_switch; bool need_ctx_switch;
enum amdgpu_ring_type type; enum amdgpu_ring_type type;
char name[16]; char name[16];

4
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
View File

@@ -642,8 +642,10 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
ib->is_const_ib = true; ib->is_const_ib = true;
if (chunk_ib->flags & AMDGPU_IB_FLAG_GDS) if (chunk_ib->flags & AMDGPU_IB_FLAG_GDS)
ib->gds_needed = true; ib->gds_needed = true;
if (ib->ring->current_filp != parser->filp) { if ((ib->ring->current_filp != parser->filp) ||
(ib->ring->current_ctx != parser->ctx_id)) {
ib->ring->need_ctx_switch = true; ib->ring->need_ctx_switch = true;
ib->ring->current_ctx = parser->ctx_id;
ib->ring->current_filp = parser->filp; ib->ring->current_filp = parser->filp;
} }