Commit bfdb68ec authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: skip ASD fw load for sienna_cichlid 



Skip ASD FW load for sienna_cichlid currently.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b07e5c60

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

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int psp_asd_load(struct psp_context *psp) 
	 * add workaround to bypass it for sriov now.

	 * TODO: add version check to make it common

	 */

	if (amdgpu_sriov_vf(psp->adev))

	if (amdgpu_sriov_vf(psp->adev) || (psp->adev->asic_type == CHIP_SIENNA_CICHLID))

		return 0;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

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

+5 −3
Original line number Diff line number Diff line
@@ -103,9 +103,11 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
	if (err)

		return err;



	if (adev->asic_type != CHIP_SIENNA_CICHLID) {

		err = psp_init_asd_microcode(psp, chip_name);

		if (err)

			return err;

	}



	switch (adev->asic_type) {

	case CHIP_VEGA20: