Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: extract common code in vi_common_early_init

Change-Id: I9ed25353c559e27bc1b1d5b50f977b0ff03de87f
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>

authored by

Flora Cui and committed by
Alex Deucher
a3d08fa5 32544d02

+3 -6
+3 -6
drivers/gpu/drm/amd/amdgpu/vi.c
··· 1410 1410 adev->cg_flags = 0; 1411 1411 adev->pg_flags = 0; 1412 1412 adev->external_rev_id = 0x1; 1413 - if (amdgpu_smc_load_fw && smc_enabled) 1414 - adev->firmware.smu_load = true; 1415 1413 break; 1416 1414 case CHIP_FIJI: 1417 1415 case CHIP_TONGA: ··· 1417 1419 adev->cg_flags = 0; 1418 1420 adev->pg_flags = 0; 1419 1421 adev->external_rev_id = adev->rev_id + 0x14; 1420 - if (amdgpu_smc_load_fw && smc_enabled) 1421 - adev->firmware.smu_load = true; 1422 1422 break; 1423 1423 case CHIP_CARRIZO: 1424 1424 case CHIP_STONEY: ··· 1425 1429 /* Disable UVD pg */ 1426 1430 adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE; 1427 1431 adev->external_rev_id = adev->rev_id + 0x1; 1428 - if (amdgpu_smc_load_fw && smc_enabled) 1429 - adev->firmware.smu_load = true; 1430 1432 break; 1431 1433 default: 1432 1434 /* FIXME: not supported yet */ 1433 1435 return -EINVAL; 1434 1436 } 1437 + 1438 + if (amdgpu_smc_load_fw && smc_enabled) 1439 + adev->firmware.smu_load = true; 1435 1440 1436 1441 return 0; 1437 1442 }