Commit f5cdc2da authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: skip all gfx ring settings for Arcturus 



Not needed on Arcturus.

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f8b733b9

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

+25 −14
Original line number Diff line number Diff line
@@ -3342,18 +3342,22 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) 
	if (r)

		return r;



	if (adev->asic_type != CHIP_ARCTURUS) {

		r = gfx_v9_0_cp_gfx_resume(adev);

		if (r)

			return r;

	}



	r = gfx_v9_0_kcq_resume(adev);

	if (r)

		return r;



	if (adev->asic_type != CHIP_ARCTURUS) {

		ring = &adev->gfx.gfx_ring[0];

		r = amdgpu_ring_test_helper(ring);

		if (r)

			return r;

	}



	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		ring = &adev->gfx.compute_ring[i];
@@ -3367,6 +3371,7 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) 


static void gfx_v9_0_cp_enable(struct amdgpu_device *adev, bool enable)

{

	if (adev->asic_type != CHIP_ARCTURUS)

		gfx_v9_0_cp_gfx_enable(adev, enable);

	gfx_v9_0_cp_compute_enable(adev, enable);

}
@@ -3392,9 +3397,11 @@ static int gfx_v9_0_hw_init(void *handle) 
	if (r)

		return r;



	if (adev->asic_type != CHIP_ARCTURUS) {

		r = gfx_v9_0_ngg_en(adev);

		if (r)

			return r;

	}



	return r;

}
@@ -3542,6 +3549,7 @@ static int gfx_v9_0_soft_reset(void *handle) 
		/* stop the rlc */

		adev->gfx.rlc.funcs->stop(adev);



		if (adev->asic_type != CHIP_ARCTURUS)

			/* Disable GFX parsing/prefetching */

			gfx_v9_0_cp_gfx_enable(adev, false);
@@ -3886,6 +3894,9 @@ static int gfx_v9_0_early_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->asic_type == CHIP_ARCTURUS)

		adev->gfx.num_gfx_rings = 0;

	else

		adev->gfx.num_gfx_rings = GFX9_NUM_GFX_RINGS;

	adev->gfx.num_compute_rings = AMDGPU_MAX_COMPUTE_RINGS;

	gfx_v9_0_set_ring_funcs(adev);