Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea5e4c87 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: remove some more semaphore leftovers 



No longer needed since semaphores were removed.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cadf97b1

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −8
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ extern int amdgpu_vm_fault_stop; 
extern int amdgpu_vm_debug;

extern int amdgpu_sched_jobs;

extern int amdgpu_sched_hw_submission;

extern int amdgpu_enable_semaphores;

extern int amdgpu_powerplay;



#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000
@@ -188,7 +187,6 @@ struct amdgpu_fence; 
struct amdgpu_ib;

struct amdgpu_vm;

struct amdgpu_ring;

struct amdgpu_semaphore;

struct amdgpu_cs_parser;

struct amdgpu_job;

struct amdgpu_irq_src;
@@ -333,9 +331,6 @@ struct amdgpu_ring_funcs { 
			struct amdgpu_ib *ib);

	void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr,

			   uint64_t seq, unsigned flags);

	bool (*emit_semaphore)(struct amdgpu_ring *ring,

			       struct amdgpu_semaphore *semaphore,

			       bool emit_wait);

	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,

			      uint64_t pd_addr);

	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
@@ -842,8 +837,6 @@ struct amdgpu_ring { 
	bool			ready;

	u32			nop;

	u32			idx;

	u64			last_semaphore_signal_addr;

	u64			last_semaphore_wait_addr;

	u32			me;

	u32			pipe;

	u32			queue;
@@ -2226,7 +2219,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib))

#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))

#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

#define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait))

#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))

#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+0 −4
Original line number Diff line number Diff line
@@ -491,10 +491,6 @@ static int amdgpu_debugfs_ring_info(struct seq_file *m, void *data) 


	seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n",

		   ring->wptr, ring->wptr);

	seq_printf(m, "last semaphore signal addr : 0x%016llx\n",

		   ring->last_semaphore_signal_addr);

	seq_printf(m, "last semaphore wait addr   : 0x%016llx\n",

		   ring->last_semaphore_wait_addr);

	seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw);

	seq_printf(m, "%u dwords in ring\n", count);

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

+0 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,6 @@ static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { 
	.parse_cs = NULL,

	.emit_ib = cik_sdma_ring_emit_ib,

	.emit_fence = cik_sdma_ring_emit_fence,

	.emit_semaphore = NULL,

	.emit_vm_flush = cik_sdma_ring_emit_vm_flush,

	.emit_hdp_flush = cik_sdma_ring_emit_hdp_flush,

	.test_ring = cik_sdma_ring_test_ring,

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c

+0 −2
Original line number Diff line number Diff line
@@ -5537,7 +5537,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { 
	.parse_cs = NULL,

	.emit_ib = gfx_v7_0_ring_emit_ib_gfx,

	.emit_fence = gfx_v7_0_ring_emit_fence_gfx,

	.emit_semaphore = NULL,

	.emit_vm_flush = gfx_v7_0_ring_emit_vm_flush,

	.emit_gds_switch = gfx_v7_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush,
@@ -5553,7 +5552,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = { 
	.parse_cs = NULL,

	.emit_ib = gfx_v7_0_ring_emit_ib_compute,

	.emit_fence = gfx_v7_0_ring_emit_fence_compute,

	.emit_semaphore = NULL,

	.emit_vm_flush = gfx_v7_0_ring_emit_vm_flush,

	.emit_gds_switch = gfx_v7_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush,

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

+0 −2
Original line number Diff line number Diff line
@@ -5107,7 +5107,6 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { 
	.parse_cs = NULL,

	.emit_ib = gfx_v8_0_ring_emit_ib_gfx,

	.emit_fence = gfx_v8_0_ring_emit_fence_gfx,

	.emit_semaphore = NULL,

	.emit_vm_flush = gfx_v8_0_ring_emit_vm_flush,

	.emit_gds_switch = gfx_v8_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v8_0_ring_emit_hdp_flush,
@@ -5123,7 +5122,6 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { 
	.parse_cs = NULL,

	.emit_ib = gfx_v8_0_ring_emit_ib_compute,

	.emit_fence = gfx_v8_0_ring_emit_fence_compute,

	.emit_semaphore = NULL,

	.emit_vm_flush = gfx_v8_0_ring_emit_vm_flush,

	.emit_gds_switch = gfx_v8_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v8_0_ring_emit_hdp_flush,