Merge tag 'drm-next-2020-10-23' of git://anongit.freedesktop.org/drm/drm (fc03b2d6) · Commits · 戴 / test

Pull more drm fixes from Dave Airlie: "This should be the last round of things for rc1, a bunch of i915 fixes, some amdgpu, more font OOB fixes and one ttm fix just found reading code: fbcon/fonts: - Two patches to prevent OOB access ttm: - fix for evicition value range check amdgpu: - Sienna Cichlid fixes - MST manager resource leak fix - GPU reset fix amdkfd: - Luxmark fix for Navi1x i915: - Tweak initial DPCD backlight.enabled value (Sean) - Initialize reserved MOCS indices (Ayaz) - Mark initial fb obj as WT on eLLC machines to avoid rcu lockup (Ville) - Support parsing of oversize batches (Chris) - Delay execlists processing for TGL (Chris) - Use the active reference on the vma during error capture (Chris) - Widen CSB pointer (Chris) - Wait for CSB entries on TGL (Chris) - Fix unwind for scratch page allocation (Chris) - Exclude low patches of stolen memory (Chris) - Force VT'd workarounds when running as a guest OS (Chris) - Drop runtime-pm assert from vpgu io accessors (Chris)" * tag 'drm-next-2020-10-23' of git://anongit.freedesktop.org/drm/drm: (31 commits) drm/amdgpu: correct the cu and rb info for sienna cichlid drm/amd/pm: remove the average clock value in sysfs drm/amd/pm: fix pp_dpm_fclk Revert drm/amdgpu: disable sienna chichlid UMC RAS drm/amd/pm: fix pcie information for sienna cichlid drm/amdkfd: Use same SQ prefetch setting as amdgpu drm/amd/swsmu: correct wrong feature bit mapping drm/amd/psp: Fix sysfs: cannot create duplicate filename drm/amd/display: Avoid MST manager resource leak. drm/amd/display: Revert "drm/amd/display: Fix a list corruption" drm/amdgpu: update golden setting for sienna_cichlid drm/amd/swsmu: add missing feature map for sienna_cichlid drm/amdgpu: correct the gpu reset handling for job != NULL case drm/amdgpu: add rlc iram and dram firmware support drm/amdgpu: add function to program pbb mode for sienna cichlid drm/i915: Drop runtime-pm assert from vgpu io accessors drm/i915: Force VT'd workarounds when running as a guest OS drm/i915: Exclude low pages (128KiB) of stolen from use drm/i915/gt: Onion unwind for scratch page allocation failure drm/ttm: fix eviction valuable range check. ...

Documentation/fb/fbcon.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ C. Boot options
		1. fbcon=font:<name>

		Select the initial font to use. The value 'name' can be any of the
		compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,
		compiled-in fonts: 10x18, 6x10, 6x8, 7x14, Acorn8x8, MINI4x6,
		PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.

		Note, not all drivers can handle font with widths not divisible by 8,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4625,7 +4625,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
		retry: /* Rest of adevs pre asic reset from XGMI hive. */
		list_for_each_entry(tmp_adev, device_list_handle, gmc.xgmi.head) {
		r = amdgpu_device_pre_asic_reset(tmp_adev,
		NULL,
		(tmp_adev == adev) ? job : NULL,
		&need_full_reset);
		/TODO Should we stop ?/
		if (r) {

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,8 @@ static int psp_sw_fini(void *handle)
		adev->psp.ta_fw = NULL;
		}

		if (adev->asic_type == CHIP_NAVI10)
		if (adev->asic_type == CHIP_NAVI10 \|\|
		adev->asic_type == CHIP_SIENNA_CICHLID)
		psp_sysfs_fini(adev);

		return 0;
		@@ -1750,6 +1751,12 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode,
		case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM:
		*type = GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM;
		break;
		case AMDGPU_UCODE_ID_RLC_IRAM:
		*type = GFX_FW_TYPE_RLC_IRAM;
		break;
		case AMDGPU_UCODE_ID_RLC_DRAM:
		*type = GFX_FW_TYPE_RLC_DRAM_BOOT;
		break;
		case AMDGPU_UCODE_ID_SMC:
		*type = GFX_FW_TYPE_SMU;
		break;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1986,7 +1986,8 @@ static int amdgpu_ras_check_asic_type(struct amdgpu_device *adev)
		{
		if (adev->asic_type != CHIP_VEGA10 &&
		adev->asic_type != CHIP_VEGA20 &&
		adev->asic_type != CHIP_ARCTURUS)
		adev->asic_type != CHIP_ARCTURUS &&
		adev->asic_type != CHIP_SIENNA_CICHLID)
		return 1;
		else
		return 0;
		@@ -2030,7 +2031,6 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev,

		*supported = amdgpu_ras_enable == 0 ?
		0 : *hw_supported & amdgpu_ras_mask;

		adev->ras_features = *supported;
		}

drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -168,12 +168,16 @@ struct amdgpu_rlc {
		u32 save_restore_list_cntl_size_bytes;
		u32 save_restore_list_gpm_size_bytes;
		u32 save_restore_list_srm_size_bytes;
		u32 rlc_iram_ucode_size_bytes;
		u32 rlc_dram_ucode_size_bytes;

		u32 *register_list_format;
		u32 *register_restore;
		u8 *save_restore_list_cntl;
		u8 *save_restore_list_gpm;
		u8 *save_restore_list_srm;
		u8 *rlc_iram_ucode;
		u8 *rlc_dram_ucode;

		bool is_rlc_v2_1;

Admin message