Commit 0533af16 authored by Jiansong Chen's avatar Jiansong Chen Committed by Alex Deucher
Browse files

drm/amdgpu: remove unnecessary asic check for sdma5.2 



For sdma5.2, all sdma instances will share the same fw,
remove unnecessary asic check to be more generic.

Signed-off-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 823e4bd6

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

+5 −26
Original line number Diff line number Diff line
@@ -119,15 +119,7 @@ static int sdma_v5_2_init_inst_ctx(struct amdgpu_sdma_instance *sdma_inst) 


static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev)

{

	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		release_firmware(adev->sdma.instance[i].fw);

		adev->sdma.instance[i].fw = NULL;



		if (adev->asic_type == CHIP_SIENNA_CICHLID)

			break;

	}

	release_firmware(adev->sdma.instance[0].fw);



	memset((void *)adev->sdma.instance, 0,

	       sizeof(struct amdgpu_sdma_instance) * AMDGPU_MAX_SDMA_INSTANCES);
@@ -185,23 +177,10 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) 
	if (err)

		goto out;



	for (i = 1; i < adev->sdma.num_instances; i++) {

		if (adev->asic_type >= CHIP_SIENNA_CICHLID &&

		    adev->asic_type <= CHIP_DIMGREY_CAVEFISH) {

	for (i = 1; i < adev->sdma.num_instances; i++)

		memcpy((void *)&adev->sdma.instance[i],

		       (void *)&adev->sdma.instance[0],

		       sizeof(struct amdgpu_sdma_instance));

		} else {

			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma%d.bin", chip_name, i);

			err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);

			if (err)

				goto out;



			err = sdma_v5_2_init_inst_ctx(&adev->sdma.instance[i]);

			if (err)

				goto out;

		}

	}



	DRM_DEBUG("psp_load == '%s'\n",

		  adev->firmware.load_type == AMDGPU_FW_LOAD_PSP ? "true" : "false");