This is a note to let you know that I've just added the patch titled drm/amdgpu: handle polaris10/11 overlap asics (v2) to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-handle-polaris10-11-overlap-asics-v2.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 1d4624cd72b912b2680c08d0be48338a1629a858 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@xxxxxxx> Date: Mon, 21 Nov 2022 15:52:19 -0500 Subject: drm/amdgpu: handle polaris10/11 overlap asics (v2) From: Alex Deucher <alexander.deucher@xxxxxxx> commit 1d4624cd72b912b2680c08d0be48338a1629a858 upstream. Some special polaris 10 chips overlap with the polaris11 DID range. Handle this properly in the driver. v2: use local flags for other function calls. Acked-by: Luben Tuikov <luben.tuikov@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2040,6 +2040,15 @@ static int amdgpu_pci_probe(struct pci_d "See modparam exp_hw_support\n"); return -ENODEV; } + /* differentiate between P10 and P11 asics with the same DID */ + if (pdev->device == 0x67FF && + (pdev->revision == 0xE3 || + pdev->revision == 0xE7 || + pdev->revision == 0xF3 || + pdev->revision == 0xF7)) { + flags &= ~AMD_ASIC_MASK; + flags |= CHIP_POLARIS10; + } /* Due to hardware bugs, S/G Display on raven requires a 1:1 IOMMU mapping, * however, SME requires an indirect IOMMU mapping because the encryption @@ -2109,12 +2118,12 @@ static int amdgpu_pci_probe(struct pci_d pci_set_drvdata(pdev, ddev); - ret = amdgpu_driver_load_kms(adev, ent->driver_data); + ret = amdgpu_driver_load_kms(adev, flags); if (ret) goto err_pci; retry_init: - ret = drm_dev_register(ddev, ent->driver_data); + ret = drm_dev_register(ddev, flags); if (ret == -EAGAIN && ++retry <= 3) { DRM_INFO("retry init %d\n", retry); /* Don't request EX mode too frequently which is attacking */ Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-6.1/drm-amd-pm-add-missing-smu13.0.7-mm_dpm-feature-mapping.patch queue-6.1/drm-amd-pm-add-missing-smu13.0.0-mm_dpm-feature-mapping.patch queue-6.1/drm-amdgpu-skip-mes-self-test-after-s0i3-resume-for-mes-ip-v11.0.patch queue-6.1/drm-amd-pm-correct-the-fan-speed-retrieving-in-pwm-for-some-smu13-asics.patch queue-6.1/drm-amd-pm-update-smu13.0.0-reported-maximum-shader-clock.patch queue-6.1/drm-amd-pm-correct-smu13.0.0-pstate-profiling-clock-settings.patch queue-6.1/drm-amdgpu-fix-mmhub-register-base-coding-error.patch queue-6.1/drm-amdgpu-make-display-pinning-more-flexible-v2.patch queue-6.1/drm-amd-display-add-dcn314-display-sg-support.patch queue-6.1/drm-amdgpu-handle-polaris10-11-overlap-asics-v2.patch queue-6.1/drm-amd-pm-bump-smu13.0.0-driver_if-header-to-version-0x34.patch queue-6.1/drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch