From: Greg Kroah-Hartman Date: Mon, 11 Jul 2022 14:49:48 +0000 (+0200) Subject: drop some amd drm patches from 5.15 X-Git-Tag: v4.9.323~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66d6f7d4cfbac2b10b631ce7e8fe9675b22f2845;p=thirdparty%2Fkernel%2Fstable-queue.git drop some amd drm patches from 5.15 --- diff --git a/queue-5.15/drm-amdgpu-bind-to-any-0x1002-pci-diplay-class-devic.patch b/queue-5.15/drm-amdgpu-bind-to-any-0x1002-pci-diplay-class-devic.patch deleted file mode 100644 index 1d9c7639b40..00000000000 --- a/queue-5.15/drm-amdgpu-bind-to-any-0x1002-pci-diplay-class-devic.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c33a17fe4004dfa57beeec79734d66651652654e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Aug 2021 17:18:53 -0400 -Subject: drm/amdgpu: bind to any 0x1002 PCI diplay class device -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alex Deucher - -[ Upstream commit eb4fd29afd4aa1c98d882800ceeee7d1f5262803 ] - -Bind to all 0x1002 GPU devices. - -For now we explicitly return -ENODEV for generic bindings. -Remove this check once IP discovery based checking is in place. - -v2: rebase (Alex) - -Reviewed-by: Christian König -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index f65b4b233ffb..c294081022bd 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -1952,6 +1952,16 @@ static const struct pci_device_id pciidlist[] = { - {0x1002, 0x7424, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x743F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - -+ { PCI_DEVICE(0x1002, PCI_ANY_ID), -+ .class = PCI_CLASS_DISPLAY_VGA << 8, -+ .class_mask = 0xffffff, -+ .driver_data = 0 }, -+ -+ { PCI_DEVICE(0x1002, PCI_ANY_ID), -+ .class = PCI_CLASS_DISPLAY_OTHER << 8, -+ .class_mask = 0xffffff, -+ .driver_data = 0 }, -+ - {0, 0, 0} - }; - -@@ -1999,6 +2009,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, - return -ENODEV; - } - -+ if (flags == 0) { -+ DRM_INFO("Unsupported asic. Remove me when IP discovery init is in place.\n"); -+ return -ENODEV; -+ } -+ - if (amdgpu_virtual_display || - amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK)) - supports_atomic = true; --- -2.35.1 - diff --git a/queue-5.15/drm-amdgpu-drop-flags-check-for-chip_ip_discovery.patch b/queue-5.15/drm-amdgpu-drop-flags-check-for-chip_ip_discovery.patch deleted file mode 100644 index 5c0bcf60d95..00000000000 --- a/queue-5.15/drm-amdgpu-drop-flags-check-for-chip_ip_discovery.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 33a59f2b018f781bebc5f322a3779f5581b866e2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Jan 2022 09:59:29 -0500 -Subject: drm/amdgpu: drop flags check for CHIP_IP_DISCOVERY - -From: Alex Deucher - -[ Upstream commit d82ce3cd30aa28db3e94ffc36ebf0af2ff12801d ] - -Support for IP based discovery is in place now so this -check is no longer required. - -Reviewed-by: Hawking Zhang -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index cb0b5972e7fd..a0dd4b41ba4a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -2009,11 +2009,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, - return -ENODEV; - } - -- if (flags == CHIP_IP_DISCOVERY) { -- DRM_INFO("Unsupported asic. Remove me when IP discovery init is in place.\n"); -- return -ENODEV; -- } -- - if (amdgpu_virtual_display || - amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK)) - supports_atomic = true; --- -2.35.1 - diff --git a/queue-5.15/drm-amdgpu-fix-rejecting-tahiti-gpus.patch b/queue-5.15/drm-amdgpu-fix-rejecting-tahiti-gpus.patch deleted file mode 100644 index ad57a9d8501..00000000000 --- a/queue-5.15/drm-amdgpu-fix-rejecting-tahiti-gpus.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c995df2c71b06e788627a83d76c565a56142bf76 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Jan 2022 07:51:41 +0100 -Subject: drm/amdgpu: Fix rejecting Tahiti GPUs - -From: Lukas Fink - -[ Upstream commit 3993a799fc971bc9b918bd969aa55864447b5dde ] -[ Upstream commit 5f0754ab2751d1935818459e8e71a8fe26f6403c ] - -eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") added -generic bindings to amdgpu so that that it binds to all display class devices -with VID 0x1002 and then rejects those in amdgpu_pci_probe. - -Unfortunately it reuses a driver_data value of 0 to detect those new bindings, -which is already used to denote CHIP_TAHITI ASICs. - -The driver_data value given to those new bindings was changed in -dd0761fd24ea1 ("drm/amdgpu: set CHIP_IP_DISCOVERY as the asic type by default") -to CHIP_IP_DISCOVERY (=36), but it seems that the check in amdgpu_pci_probe -was forgotten to be changed. Therefore, it still rejects Tahiti GPUs. - -Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1860 -Fixes: eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") -Cc: stable@vger.kernel.org -Signed-off-by: Lukas Fink -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -2009,7 +2009,7 @@ static int amdgpu_pci_probe(struct pci_d - return -ENODEV; - } - -- if (flags == 0) { -+ if (flags == CHIP_IP_DISCOVERY) { - DRM_INFO("Unsupported asic. Remove me when IP discovery init is in place.\n"); - return -ENODEV; - } diff --git a/queue-5.15/series b/queue-5.15/series index 78f5e27c0b3..f053265c6e5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -136,9 +136,6 @@ powerpc-vdso-move-cvdso_call-macro-into-gettimeofday.patch powerpc-vdso-fix-incorrect-cfi-in-gettimeofday.s.patch serial-8250_mtk-make-sure-to-select-the-right-featur.patch tty-n_gsm-fix-invalid-gsmtty_write_room-result.patch -drm-amdgpu-bind-to-any-0x1002-pci-diplay-class-devic.patch -drm-amdgpu-fix-rejecting-tahiti-gpus.patch -drm-amdgpu-drop-flags-check-for-chip_ip_discovery.patch drm-amd-refactor-amdgpu_aspm-to-be-evaluated-per-dev.patch drm-amdgpu-vi-disable-aspm-on-intel-alder-lake-based.patch drm-i915-fix-a-race-between-vma-object-destruction-a.patch