aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-03-11 09:12:53 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-14 14:08:30 -0400
commit22e5a2f46a26adc6822c54af946b384e14930417 (patch)
tree7e8e3e849c38fa284167887d495675d94b76307b /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent77163f074aa68b06f6de2f2fc271f4a828d56da2 (diff)
drm/amdgpu: move fence structure into amdgpu_fence.c
No need to have that in the header file any more. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@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.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index d4411f60d1ce..7dee9af33196 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -180,7 +180,6 @@ extern int amdgpu_powerplay;
180#define CIK_CURSOR_HEIGHT 128 180#define CIK_CURSOR_HEIGHT 128
181 181
182struct amdgpu_device; 182struct amdgpu_device;
183struct amdgpu_fence;
184struct amdgpu_ib; 183struct amdgpu_ib;
185struct amdgpu_vm; 184struct amdgpu_vm;
186struct amdgpu_ring; 185struct amdgpu_ring;
@@ -403,16 +402,6 @@ struct amdgpu_fence_driver {
403#define AMDGPU_FENCE_FLAG_64BIT (1 << 0) 402#define AMDGPU_FENCE_FLAG_64BIT (1 << 0)
404#define AMDGPU_FENCE_FLAG_INT (1 << 1) 403#define AMDGPU_FENCE_FLAG_INT (1 << 1)
405 404
406struct amdgpu_fence {
407 struct fence base;
408
409 /* RB, DMA, etc. */
410 struct amdgpu_ring *ring;
411 uint64_t seq;
412
413 wait_queue_t fence_wake;
414};
415
416struct amdgpu_user_fence { 405struct amdgpu_user_fence {
417 /* write-back bo */ 406 /* write-back bo */
418 struct amdgpu_bo *bo; 407 struct amdgpu_bo *bo;
@@ -2109,20 +2098,6 @@ u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32 index);
2109void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v); 2098void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);
2110 2099
2111/* 2100/*
2112 * Cast helper
2113 */
2114extern const struct fence_ops amdgpu_fence_ops;
2115static inline struct amdgpu_fence *to_amdgpu_fence(struct fence *f)
2116{
2117 struct amdgpu_fence *__f = container_of(f, struct amdgpu_fence, base);
2118
2119 if (__f->base.ops == &amdgpu_fence_ops)
2120 return __f;
2121
2122 return NULL;
2123}
2124
2125/*
2126 * Registers read & write functions. 2101 * Registers read & write functions.
2127 */ 2102 */
2128#define RREG32(reg) amdgpu_mm_rreg(adev, (reg), false) 2103#define RREG32(reg) amdgpu_mm_rreg(adev, (reg), false)