diff options
author | Christian König <christian.koenig@amd.com> | 2015-08-04 11:51:05 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:02 -0400 |
commit | 47f38501f11fa45d8a7797f1965448c1e20049d4 (patch) | |
tree | 67bba28445392c7584477178fce996a412e72dc3 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 0e89d0c16b9446a094215e71734e583c438bf83d (diff) |
drm/amdgpu: cleanup amdgpu_ctx inti/fini v2
Cleanup the kernel context handling.
v2: rebased
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com> (v1)
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 0cd776a55f05..53d70f766afe 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1033,10 +1033,9 @@ struct amdgpu_ctx_mgr { | |||
1033 | struct idr ctx_handles; | 1033 | struct idr ctx_handles; |
1034 | }; | 1034 | }; |
1035 | 1035 | ||
1036 | int amdgpu_ctx_alloc(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv, | 1036 | int amdgpu_ctx_init(struct amdgpu_device *adev, bool kernel, |
1037 | uint32_t *id); | 1037 | struct amdgpu_ctx *ctx); |
1038 | int amdgpu_ctx_free(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv, | 1038 | void amdgpu_ctx_fini(struct amdgpu_ctx *ctx); |
1039 | uint32_t id); | ||
1040 | 1039 | ||
1041 | struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id); | 1040 | struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id); |
1042 | int amdgpu_ctx_put(struct amdgpu_ctx *ctx); | 1041 | int amdgpu_ctx_put(struct amdgpu_ctx *ctx); |
@@ -2095,7 +2094,7 @@ struct amdgpu_device { | |||
2095 | struct kfd_dev *kfd; | 2094 | struct kfd_dev *kfd; |
2096 | 2095 | ||
2097 | /* kernel conext for IB submission */ | 2096 | /* kernel conext for IB submission */ |
2098 | struct amdgpu_ctx *kernel_ctx; | 2097 | struct amdgpu_ctx kernel_ctx; |
2099 | }; | 2098 | }; |
2100 | 2099 | ||
2101 | bool amdgpu_device_is_px(struct drm_device *dev); | 2100 | bool amdgpu_device_is_px(struct drm_device *dev); |