diff options
author | Christian König <christian.koenig@amd.com> | 2016-05-03 09:17:40 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-11 12:31:27 -0400 |
commit | aa3b73f67bda66637f17c3d847a8a36d3649f3f8 (patch) | |
tree | f3025d5a5fa4a8ec850641197d62eaf8010a4ac7 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 822b2cef4d9ffe680b880ec39734ad8a1d178b02 (diff) |
drm/amdgpu: use fence_context to judge ctx switch v2
Use of the ctx pointer is not safe, because they are likely already
be assigned to another ctx when doing comparing.
v2: recreate from scratch, avoid all unnecessary changes.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Monk.Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index ac26b13678b1..781f0471ef06 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -743,7 +743,7 @@ struct amdgpu_ib { | |||
743 | struct amdgpu_user_fence *user; | 743 | struct amdgpu_user_fence *user; |
744 | unsigned vm_id; | 744 | unsigned vm_id; |
745 | uint64_t vm_pd_addr; | 745 | uint64_t vm_pd_addr; |
746 | struct amdgpu_ctx *ctx; | 746 | uint64_t ctx; |
747 | uint32_t gds_base, gds_size; | 747 | uint32_t gds_base, gds_size; |
748 | uint32_t gws_base, gws_size; | 748 | uint32_t gws_base, gws_size; |
749 | uint32_t oa_base, oa_size; | 749 | uint32_t oa_base, oa_size; |
@@ -806,7 +806,7 @@ struct amdgpu_ring { | |||
806 | unsigned wptr_offs; | 806 | unsigned wptr_offs; |
807 | unsigned next_rptr_offs; | 807 | unsigned next_rptr_offs; |
808 | unsigned fence_offs; | 808 | unsigned fence_offs; |
809 | struct amdgpu_ctx *current_ctx; | 809 | uint64_t current_ctx; |
810 | enum amdgpu_ring_type type; | 810 | enum amdgpu_ring_type type; |
811 | char name[16]; | 811 | char name[16]; |
812 | unsigned cond_exe_offs; | 812 | unsigned cond_exe_offs; |