From: Greg Kroah-Hartman Date: Sun, 7 Sep 2025 13:17:51 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v5.4.299~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=427dd147083518447558a993cea6e0508f5244d1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: alsa-hda-hdmi-add-pin-fix-for-another-hp-elitedesk-800-g4-model.patch alsa-hda-realtek-fix-headset-mic-for-tongfang-x6r5xxy.patch revert-drm-amdgpu-avoid-extra-evict-restore-process.patch --- diff --git a/queue-6.6/alsa-hda-hdmi-add-pin-fix-for-another-hp-elitedesk-800-g4-model.patch b/queue-6.6/alsa-hda-hdmi-add-pin-fix-for-another-hp-elitedesk-800-g4-model.patch new file mode 100644 index 0000000000..603add0e27 --- /dev/null +++ b/queue-6.6/alsa-hda-hdmi-add-pin-fix-for-another-hp-elitedesk-800-g4-model.patch @@ -0,0 +1,31 @@ +From bcd6659d4911c528381531472a0cefbd4003e29e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Mon, 1 Sep 2025 13:50:08 +0200 +Subject: ALSA: hda/hdmi: Add pin fix for another HP EliteDesk 800 G4 model + +From: Takashi Iwai + +commit bcd6659d4911c528381531472a0cefbd4003e29e upstream. + +It was reported that HP EliteDesk 800 G4 DM 65W (SSID 103c:845a) needs +the similar quirk for enabling HDMI outputs, too. This patch adds the +corresponding quirk entry. + +Cc: +Link: https://patch.msgid.link/20250901115009.27498-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_hdmi.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -1991,6 +1991,7 @@ static int hdmi_add_cvt(struct hda_codec + static const struct snd_pci_quirk force_connect_list[] = { + SND_PCI_QUIRK(0x103c, 0x83e2, "HP EliteDesk 800 G4", 1), + SND_PCI_QUIRK(0x103c, 0x83ef, "HP MP9 G4 Retail System AMS", 1), ++ SND_PCI_QUIRK(0x103c, 0x845a, "HP EliteDesk 800 G4 DM 65W", 1), + SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), diff --git a/queue-6.6/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6r5xxy.patch b/queue-6.6/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6r5xxy.patch new file mode 100644 index 0000000000..08d7dd42e7 --- /dev/null +++ b/queue-6.6/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6r5xxy.patch @@ -0,0 +1,32 @@ +From 051b02b17a8b383ee033db211f90f24b91ac7006 Mon Sep 17 00:00:00 2001 +From: Aaron Erhardt +Date: Tue, 26 Aug 2025 16:10:54 +0200 +Subject: ALSA: hda/realtek: Fix headset mic for TongFang X6[AF]R5xxY + +From: Aaron Erhardt + +commit 051b02b17a8b383ee033db211f90f24b91ac7006 upstream. + +Add a PCI quirk to enable microphone detection on the headphone jack of +TongFang X6AR5xxY and X6FR5xxY devices. + +Signed-off-by: Aaron Erhardt +Cc: +Link: https://patch.msgid.link/20250826141054.1201482-1-aer@tuxedocomputers.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -10635,6 +10635,8 @@ static const struct hda_quirk alc269_fix + SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP), + SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x1d05, 0x1409, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC), ++ SND_PCI_QUIRK(0x1d05, 0x300f, "TongFang X6AR5xxY", ALC2XX_FIXUP_HEADSET_MIC), ++ SND_PCI_QUIRK(0x1d05, 0x3019, "TongFang X6FR5xxY", ALC2XX_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x1d17, 0x3288, "Haier Boyue G42", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS), + SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC), + SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE), diff --git a/queue-6.6/revert-drm-amdgpu-avoid-extra-evict-restore-process.patch b/queue-6.6/revert-drm-amdgpu-avoid-extra-evict-restore-process.patch new file mode 100644 index 0000000000..fe415827f3 --- /dev/null +++ b/queue-6.6/revert-drm-amdgpu-avoid-extra-evict-restore-process.patch @@ -0,0 +1,44 @@ +From alexander.deucher@amd.com Sun Sep 7 15:13:02 2025 +From: Alex Deucher +Date: Fri, 29 Aug 2025 15:36:52 -0400 +Subject: Revert "drm/amdgpu: Avoid extra evict-restore process." +To: , , +Cc: Alex Deucher +Message-ID: <20250829193652.1925084-1-alexander.deucher@amd.com> + +From: Alex Deucher + +This reverts commit a3201e3b7cf10bcd3d7eef4859d275eb6d98e12a which is +commit 1f02f2044bda1db1fd995bc35961ab075fa7b5a2 upstream. + +This commit introduced a regression, however the fix for the regression: +aa5fc4362fac ("drm/amdgpu: fix task hang from failed job submission +during process kill") depends on things not yet present in 6.12.y and +older kernels. Since this commit is more of an optimization, just +revert it for 6.12.y and older stable kernels. + +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org # 6.1.x - 6.12.x +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -2125,11 +2125,13 @@ void amdgpu_vm_adjust_size(struct amdgpu + */ + long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) + { +- timeout = drm_sched_entity_flush(&vm->immediate, timeout); ++ timeout = dma_resv_wait_timeout(vm->root.bo->tbo.base.resv, ++ DMA_RESV_USAGE_BOOKKEEP, ++ true, timeout); + if (timeout <= 0) + return timeout; + +- return drm_sched_entity_flush(&vm->delayed, timeout); ++ return dma_fence_wait_timeout(vm->last_unlocked, true, timeout); + } + + /** diff --git a/queue-6.6/series b/queue-6.6/series index c9a606fc8b..264b5afab1 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -93,3 +93,6 @@ vmxnet3-update-mtu-after-device-quiesce.patch drm-mediatek-add-crtc-path-enum-for-all_drm_priv-array.patch drm-mediatek-fix-using-wrong-drm-private-data-to-bind-mediatek-drm.patch drm-mediatek-fix-device-node-reference-count-leaks-in-mtk_drm_get_all_drm_priv.patch +alsa-hda-hdmi-add-pin-fix-for-another-hp-elitedesk-800-g4-model.patch +alsa-hda-realtek-fix-headset-mic-for-tongfang-x6r5xxy.patch +revert-drm-amdgpu-avoid-extra-evict-restore-process.patch