diff options
| author | Christian König <christian.koenig@amd.com> | 2015-08-05 12:33:21 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:05 -0400 |
| commit | 91404fb20825418fd9ab8e6533bc336e1ffc748e (patch) | |
| tree | dc16e974fdfac848cee65f1f9ce4e6c2e7c2e0d7 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 4cd7f42cf8f57512b13a13bb7dcbeabb644f5264 (diff) | |
drm/amdgpu: merge amd_sched_entity and amd_context_entity v2
Avoiding a couple of casts.
v2: rename c_entity to entity as well
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 423cf91ef652..1e6800050ad8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -1013,9 +1013,9 @@ struct amdgpu_vm_manager { | |||
| 1013 | #define AMDGPU_CTX_MAX_CS_PENDING 16 | 1013 | #define AMDGPU_CTX_MAX_CS_PENDING 16 |
| 1014 | 1014 | ||
| 1015 | struct amdgpu_ctx_ring { | 1015 | struct amdgpu_ctx_ring { |
| 1016 | uint64_t sequence; | 1016 | uint64_t sequence; |
| 1017 | struct fence *fences[AMDGPU_CTX_MAX_CS_PENDING]; | 1017 | struct fence *fences[AMDGPU_CTX_MAX_CS_PENDING]; |
| 1018 | struct amd_context_entity c_entity; | 1018 | struct amd_sched_entity entity; |
| 1019 | }; | 1019 | }; |
| 1020 | 1020 | ||
| 1021 | struct amdgpu_ctx { | 1021 | struct amdgpu_ctx { |