diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 |
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 | ||
182 | struct amdgpu_device; | 182 | struct amdgpu_device; |
183 | struct amdgpu_fence; | ||
184 | struct amdgpu_ib; | 183 | struct amdgpu_ib; |
185 | struct amdgpu_vm; | 184 | struct amdgpu_vm; |
186 | struct amdgpu_ring; | 185 | struct 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 | ||
406 | struct 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 | |||
416 | struct amdgpu_user_fence { | 405 | struct 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); | |||
2109 | void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v); | 2098 | void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v); |
2110 | 2099 | ||
2111 | /* | 2100 | /* |
2112 | * Cast helper | ||
2113 | */ | ||
2114 | extern const struct fence_ops amdgpu_fence_ops; | ||
2115 | static 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) |