aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-01-15 14:33:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-02-10 14:16:51 -0500
commitea5e4c87319aad5e196455145078eb8a9e964afb (patch)
tree507e3ecd90d0eecf39aefa284b52854a9d286ac0 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parentcadf97b196a1e5b2db2606d53f77714e3e9cf4bb (diff)
drm/amdgpu: remove some more semaphore leftovers
No longer needed since semaphores were removed. Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <David1.Zhou@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.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 9d3dff244217..297b231e4fcc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -84,7 +84,6 @@ extern int amdgpu_vm_fault_stop;
84extern int amdgpu_vm_debug; 84extern int amdgpu_vm_debug;
85extern int amdgpu_sched_jobs; 85extern int amdgpu_sched_jobs;
86extern int amdgpu_sched_hw_submission; 86extern int amdgpu_sched_hw_submission;
87extern int amdgpu_enable_semaphores;
88extern int amdgpu_powerplay; 87extern int amdgpu_powerplay;
89 88
90#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 89#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000
@@ -188,7 +187,6 @@ struct amdgpu_fence;
188struct amdgpu_ib; 187struct amdgpu_ib;
189struct amdgpu_vm; 188struct amdgpu_vm;
190struct amdgpu_ring; 189struct amdgpu_ring;
191struct amdgpu_semaphore;
192struct amdgpu_cs_parser; 190struct amdgpu_cs_parser;
193struct amdgpu_job; 191struct amdgpu_job;
194struct amdgpu_irq_src; 192struct amdgpu_irq_src;
@@ -333,9 +331,6 @@ struct amdgpu_ring_funcs {
333 struct amdgpu_ib *ib); 331 struct amdgpu_ib *ib);
334 void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr, 332 void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr,
335 uint64_t seq, unsigned flags); 333 uint64_t seq, unsigned flags);
336 bool (*emit_semaphore)(struct amdgpu_ring *ring,
337 struct amdgpu_semaphore *semaphore,
338 bool emit_wait);
339 void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id, 334 void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
340 uint64_t pd_addr); 335 uint64_t pd_addr);
341 void (*emit_hdp_flush)(struct amdgpu_ring *ring); 336 void (*emit_hdp_flush)(struct amdgpu_ring *ring);
@@ -842,8 +837,6 @@ struct amdgpu_ring {
842 bool ready; 837 bool ready;
843 u32 nop; 838 u32 nop;
844 u32 idx; 839 u32 idx;
845 u64 last_semaphore_signal_addr;
846 u64 last_semaphore_wait_addr;
847 u32 me; 840 u32 me;
848 u32 pipe; 841 u32 pipe;
849 u32 queue; 842 u32 queue;
@@ -2226,7 +2219,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
2226#define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib)) 2219#define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib))
2227#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) 2220#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))
2228#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) 2221#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))
2229#define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait))
2230#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)) 2222#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))
2231#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r)) 2223#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
2232#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev)) 2224#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))