Merge tag 'drm-fixes-2020-11-06-1' of git://anongit.freedesktop.org/drm/drm (fc7b66ef) · Commits · 戴 / test

Pull drm fixes from Dave Airlie: "It's Friday here so that means another installment of drm fixes to distract you from the counting process. Changes all over the place, the amdgpu changes contain support for a new GPU that is close to current one already in the tree (Green Sardine) so it shouldn't have much side effects. Otherwise imx has a few cleanup patches and fixes, amdgpu and i915 have around the usual smattering of fixes, fonts got constified, and vc4/panfrost has some minor fixes. All in all a fairly regular rc3. We have an outstanding nouveau regression, but the author is looking into the fix, so should be here next week. I now return you to counting. fonts: - constify font structures. MAINTAINERS: - Fix path for amdgpu power management 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 i915: - Fix set domain's cache coherency - Fixes around breadcrumbs - Fix encoder lookup during PSR atomic - Hold onto an explicit ref to i915_vma_work.pinned - gvt: HWSP reset handling fix - gvt: flush workaround - gvt: vGPU context pin/unpin - gvt: mmio cmd access fix for bxt/apl imx: - drop unused functions and callbacks - reuse imx_drm_encoder_parse_of - spinlock rework - memory leak fix - minor cleanups vc4: - resource cleanup fix panfrost: - madvise/shrinker fix" * tag 'drm-fixes-2020-11-06-1' of git://anongit.freedesktop.org/drm/drm: (55 commits) drm/amdgpu/display: remove DRM_AMD_DC_GREEN_SARDINE drm/amd/display: Add green_sardine support to DM drm/amd/display: Add green_sardine support to DC drm/amdgpu: enable vcn support for green_sardine (v2) drm/amdgpu: enable green_sardine_asd.bin loading (v2) drm/amdgpu/sdma: add sdma engine support for green_sardine (v2) drm/amdgpu: add gfx support for green_sardine (v2) drm/amdgpu: add soc15 common ip block support for green_sardine (v3) drm/amdgpu: add green_sardine support for gpu_info and ip block setting (v2) drm/amdgpu: add Green_Sardine APU flag drm/amdgpu: resolved ASD loading issue on sienna amdkfd: Check kvmalloc return before memcpy drm/amdgpu: update golden setting for sienna_cichlid amd/amdgpu: Disable VCN DPG mode for Picasso drm/amdgpu/swsmu: remove duplicate call to smu_set_default_dpm_table drm/i915: Hold onto an explicit ref to i915_vma_work.pinned drm/i915/gt: Flush xcs before tgl breadcrumbs drm/i915/gt: Expose more parameters for emitting writes into the ring drm/i915: Fix encoder lookup during PSR atomic check drm/i915/gt: Use the local HWSP offset during submission ...

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

		@@ -1805,7 +1806,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;

Admin message