diff options
author | Christian König <christian.koenig@amd.com> | 2015-05-11 08:10:34 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-03 21:03:32 -0400 |
commit | d2edb07b10fce5127a60671b55ca53921c212bc3 (patch) | |
tree | 5c6c7fe319aa67c5ca0a279008381f4a31d3cd22 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 66782cec7ad8f48c09d96ee59b713f694265cfa1 (diff) |
drm/amdgpu: cleanup HDP flush handling
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index aaa62f33870f..72d9d9ec5c9f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -382,6 +382,7 @@ struct amdgpu_ring_funcs { | |||
382 | bool emit_wait); | 382 | bool emit_wait); |
383 | void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id, | 383 | void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id, |
384 | uint64_t pd_addr); | 384 | uint64_t pd_addr); |
385 | void (*emit_hdp_flush)(struct amdgpu_ring *ring); | ||
385 | void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid, | 386 | void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid, |
386 | uint32_t gds_base, uint32_t gds_size, | 387 | uint32_t gds_base, uint32_t gds_size, |
387 | uint32_t gws_base, uint32_t gws_size, | 388 | uint32_t gws_base, uint32_t gws_size, |
@@ -892,7 +893,6 @@ struct amdgpu_ib { | |||
892 | struct amdgpu_fence *fence; | 893 | struct amdgpu_fence *fence; |
893 | struct amdgpu_user_fence *user; | 894 | struct amdgpu_user_fence *user; |
894 | struct amdgpu_vm *vm; | 895 | struct amdgpu_vm *vm; |
895 | bool flush_hdp_writefifo; | ||
896 | struct amdgpu_sync sync; | 896 | struct amdgpu_sync sync; |
897 | uint32_t gds_base, gds_size; | 897 | uint32_t gds_base, gds_size; |
898 | uint32_t gws_base, gws_size; | 898 | uint32_t gws_base, gws_size; |
@@ -2203,6 +2203,7 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) | |||
2203 | #define amdgpu_ring_emit_fence(r, addr, seq, write64bit) (r)->funcs->emit_fence((r), (addr), (seq), (write64bit)) | 2203 | #define amdgpu_ring_emit_fence(r, addr, seq, write64bit) (r)->funcs->emit_fence((r), (addr), (seq), (write64bit)) |
2204 | #define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait)) | 2204 | #define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait)) |
2205 | #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) | 2205 | #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) |
2206 | #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r)) | ||
2206 | #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev)) | 2207 | #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev)) |
2207 | #define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv)) | 2208 | #define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv)) |
2208 | #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev)) | 2209 | #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev)) |