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

Commit 6f924e20 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Merge get_rptr 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 4aeacf0f

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

+3 −8
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev) 
	return 0;

}



static u32 gfx_v6_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)

static u32 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)

{

	return ring->adev->wb.wb[ring->rptr_offs];

}
@@ -1675,11 +1675,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_rptr_compute(struct amdgpu_ring *ring)

{

	return ring->adev->wb.wb[ring->rptr_offs];

}



static u32 gfx_v6_0_ring_get_wptr_compute(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;
@@ -3129,7 +3124,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_gfx,

	.get_rptr = gfx_v6_0_ring_get_rptr,

	.get_wptr = gfx_v6_0_ring_get_wptr_gfx,

	.set_wptr = gfx_v6_0_ring_set_wptr_gfx,

	.parse_cs = NULL,
@@ -3146,7 +3141,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_compute,

	.get_rptr = gfx_v6_0_ring_get_rptr,

	.get_wptr = gfx_v6_0_ring_get_wptr_compute,

	.set_wptr = gfx_v6_0_ring_set_wptr_compute,

	.parse_cs = NULL,