Commit f56fb012 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.10-2020-11-04' of... 

Merge tag 'amd-drm-fixes-5.10-2020-11-04' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.10-2020-11-04:

amdgpu:
- Add support for more navi1x SKUs
- Fix for suspend on CI dGPUs
- VCN DPG fix for Picasso
- Sienna Cichlid fixes
- Polaris DPM fix
- Add support for Green Sardine

amdkfd:
- Fix an allocation failure check

MAINTAINERS:
- Fix path for amdgpu power management

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201104205741.4100-1-alexander.deucher@amd.com
parents 866bc2d3 4241b041

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ M: Evan Quan <evan.quan@amd.com> 
L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

F:	drivers/gpu/drm/amd/powerplay/

F:	drivers/gpu/drm/amd/pm/powerplay/















AMD SEATTLE DEVICE TREE SUPPORT















M:	Brijesh Singh <brijeshkumar.singh@amd.com>

































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



+5
−1






























Original line number
Diff line number
Diff line








@@ -80,6 +80,7 @@ MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");













MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");















MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");















MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");













MODULE_FIRMWARE("amdgpu/green_sardine_gpu_info.bin");































#define AMDGPU_RESUME_MS		2000


























@@ -1803,7 +1804,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)













		chip_name = "arcturus";















		break;















	case CHIP_RENOIR:













		if (adev->apu_flags & AMD_APU_IS_RENOIR)















			chip_name = "renoir";













		else













			chip_name = "green_sardine";















		break;















	case CHIP_NAVI10:















		chip_name = "navi10";

































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



+1
−0






























Original line number
Diff line number
Diff line








@@ -2524,6 +2524,7 @@ int parse_ta_bin_descriptor(struct psp_context *psp,













		psp->asd_feature_version   = le32_to_cpu(desc->fw_version);















		psp->asd_ucode_size 	   = le32_to_cpu(desc->size_bytes);















		psp->asd_start_addr 	   = ucode_start_addr;













		psp->asd_fw                = psp->ta_fw;















		break;















	case TA_FW_TYPE_PSP_XGMI:















		psp->ta_xgmi_ucode_version = le32_to_cpu(desc->fw_version);

































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



+7
−1






























Original line number
Diff line number
Diff line








@@ -39,6 +39,7 @@













#define FIRMWARE_RAVEN2		"amdgpu/raven2_vcn.bin"















#define FIRMWARE_ARCTURUS 	"amdgpu/arcturus_vcn.bin"















#define FIRMWARE_RENOIR 	"amdgpu/renoir_vcn.bin"













#define FIRMWARE_GREEN_SARDINE 	"amdgpu/green_sardine_vcn.bin"















#define FIRMWARE_NAVI10 	"amdgpu/navi10_vcn.bin"















#define FIRMWARE_NAVI14 	"amdgpu/navi14_vcn.bin"















#define FIRMWARE_NAVI12 	"amdgpu/navi12_vcn.bin"









@@ -50,6 +51,7 @@ MODULE_FIRMWARE(FIRMWARE_PICASSO);













MODULE_FIRMWARE(FIRMWARE_RAVEN2);















MODULE_FIRMWARE(FIRMWARE_ARCTURUS);















MODULE_FIRMWARE(FIRMWARE_RENOIR);













MODULE_FIRMWARE(FIRMWARE_GREEN_SARDINE);















MODULE_FIRMWARE(FIRMWARE_NAVI10);















MODULE_FIRMWARE(FIRMWARE_NAVI14);















MODULE_FIRMWARE(FIRMWARE_NAVI12);










@@ -89,7 +91,11 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)













			adev->vcn.indirect_sram = true;















		break;















	case CHIP_RENOIR:













		if (adev->apu_flags & AMD_APU_IS_RENOIR)















			fw_name = FIRMWARE_RENOIR;













		else













			fw_name = FIRMWARE_GREEN_SARDINE;





























		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&















		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))















			adev->vcn.indirect_sram = true;

































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



+3
−1






























Original line number
Diff line number
Diff line








@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)





























	switch (adev->asic_type) {















	case CHIP_BONAIRE:













	case CHIP_HAWAII:















		/* disable baco reset until it works */















		/* smu7_asic_get_baco_capability(adev, &baco_reset); */















		baco_reset = false;















		break;













	case CHIP_HAWAII:













		baco_reset = cik_asic_supports_baco(adev);













		break;















	default:















		baco_reset = false;















		break;









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE