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

Commit 832c6ef7 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Merge get_wptr functions in gfx6 



Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7706b42

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

+11 −20
Original line number Diff line number Diff line
@@ -1660,11 +1660,18 @@ static u32 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring) 
	return ring->adev->wb.wb[ring->rptr_offs];

}



static u32 gfx_v6_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)

static u32 gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;



	if (ring == &adev->gfx.gfx_ring[0])

		return RREG32(CP_RB0_WPTR);

	else if (ring == &adev->gfx.compute_ring[0])

		return RREG32(CP_RB1_WPTR);

	else if (ring == &adev->gfx.compute_ring[1])

		return RREG32(CP_RB2_WPTR);

	else

		BUG();

}



static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
@@ -1675,22 +1682,6 @@ static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring) 
	(void)RREG32(CP_RB0_WPTR);

}



static u32 gfx_v6_0_ring_get_wptr_compute(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	u32 wptr;



	if (ring == &adev->gfx.compute_ring[0]) {

		wptr = RREG32(CP_RB1_WPTR);

	} else if (ring == &adev->gfx.compute_ring[1]) {

		wptr = RREG32(CP_RB2_WPTR);

	} else {

		BUG();

	}



	return wptr;

}



static void gfx_v6_0_ring_set_wptr_compute(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;
@@ -3125,7 +3116,7 @@ const struct amd_ip_funcs gfx_v6_0_ip_funcs = { 


static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {

	.get_rptr = gfx_v6_0_ring_get_rptr,

	.get_wptr = gfx_v6_0_ring_get_wptr_gfx,

	.get_wptr = gfx_v6_0_ring_get_wptr,

	.set_wptr = gfx_v6_0_ring_set_wptr_gfx,

	.parse_cs = NULL,

	.emit_ib = gfx_v6_0_ring_emit_ib_gfx,
@@ -3142,7 +3133,7 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = { 


static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = {

	.get_rptr = gfx_v6_0_ring_get_rptr,

	.get_wptr = gfx_v6_0_ring_get_wptr_compute,

	.get_wptr = gfx_v6_0_ring_get_wptr,

	.set_wptr = gfx_v6_0_ring_set_wptr_compute,

	.parse_cs = NULL,

	.emit_ib = gfx_v6_0_ring_emit_ib_compute,