From: Jammy Zhou Date: Fri, 8 May 2015 14:18:47 +0000 (+0800) Subject: drm/amdgpu: check context id for context switching (v2) X-Git-Tag: v4.2-rc1~13^2~25^2~50 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72efa7ebdea084b96f25021d0ba9c29074c2906f;p=karo-tx-linux.git drm/amdgpu: check context id for context switching (v2) 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 Reviewed-by: Christian König --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index bf0c607de195..a88302c0c93a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -945,6 +945,7 @@ struct amdgpu_ring { unsigned next_rptr_offs; unsigned fence_offs; struct drm_file *current_filp; + unsigned current_ctx; bool need_ctx_switch; enum amdgpu_ring_type type; char name[16]; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 86b93245bf9d..1035e443700f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -642,8 +642,10 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, ib->is_const_ib = true; if (chunk_ib->flags & AMDGPU_IB_FLAG_GDS) 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->current_ctx = parser->ctx_id; ib->ring->current_filp = parser->filp; }