diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 5dc744d43d12..34e52304a525 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -132,6 +132,11 @@ extern int radeon_lockup_timeout; | |||
132 | #define RADEON_VA_RESERVED_SIZE (8 << 20) | 132 | #define RADEON_VA_RESERVED_SIZE (8 << 20) |
133 | #define RADEON_IB_VM_MAX_SIZE (64 << 10) | 133 | #define RADEON_IB_VM_MAX_SIZE (64 << 10) |
134 | 134 | ||
135 | /* reset flags */ | ||
136 | #define RADEON_RESET_GFX (1 << 0) | ||
137 | #define RADEON_RESET_COMPUTE (1 << 1) | ||
138 | #define RADEON_RESET_DMA (1 << 2) | ||
139 | |||
135 | /* | 140 | /* |
136 | * Errata workarounds. | 141 | * Errata workarounds. |
137 | */ | 142 | */ |
@@ -225,12 +230,13 @@ struct radeon_fence { | |||
225 | int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring); | 230 | int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring); |
226 | int radeon_fence_driver_init(struct radeon_device *rdev); | 231 | int radeon_fence_driver_init(struct radeon_device *rdev); |
227 | void radeon_fence_driver_fini(struct radeon_device *rdev); | 232 | void radeon_fence_driver_fini(struct radeon_device *rdev); |
233 | void radeon_fence_driver_force_completion(struct radeon_device *rdev); | ||
228 | int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence **fence, int ring); | 234 | int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence **fence, int ring); |
229 | void radeon_fence_process(struct radeon_device *rdev, int ring); | 235 | void radeon_fence_process(struct radeon_device *rdev, int ring); |
230 | bool radeon_fence_signaled(struct radeon_fence *fence); | 236 | bool radeon_fence_signaled(struct radeon_fence *fence); |
231 | int radeon_fence_wait(struct radeon_fence *fence, bool interruptible); | 237 | int radeon_fence_wait(struct radeon_fence *fence, bool interruptible); |
232 | int radeon_fence_wait_next_locked(struct radeon_device *rdev, int ring); | 238 | int radeon_fence_wait_next_locked(struct radeon_device *rdev, int ring); |
233 | void radeon_fence_wait_empty_locked(struct radeon_device *rdev, int ring); | 239 | int radeon_fence_wait_empty_locked(struct radeon_device *rdev, int ring); |
234 | int radeon_fence_wait_any(struct radeon_device *rdev, | 240 | int radeon_fence_wait_any(struct radeon_device *rdev, |
235 | struct radeon_fence **fences, | 241 | struct radeon_fence **fences, |
236 | bool intr); | 242 | bool intr); |