From: Greg Kroah-Hartman Date: Thu, 28 Dec 2023 17:36:46 +0000 (+0000) Subject: drop some broken patches X-Git-Tag: v6.1.70~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c511d0f35b514682105d1c628bfe105e45071ced;p=thirdparty%2Fkernel%2Fstable-queue.git drop some broken patches --- diff --git a/queue-5.10/drm-i915-reject-async-flips-with-bigjoiner.patch b/queue-5.10/drm-i915-reject-async-flips-with-bigjoiner.patch deleted file mode 100644 index d87f89cd8ad..00000000000 --- a/queue-5.10/drm-i915-reject-async-flips-with-bigjoiner.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 88a173e5dd05e788068e8fa20a8c37c44bd8f416 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Mon, 11 Dec 2023 10:11:34 +0200 -Subject: drm/i915: Reject async flips with bigjoiner -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 88a173e5dd05e788068e8fa20a8c37c44bd8f416 upstream. - -Currently async flips are busted when bigjoiner is in use. -As a short term fix simply reject async flips in that case. - -Cc: stable@vger.kernel.org -Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9769 -Signed-off-by: Ville Syrjälä -Link: https://patchwork.freedesktop.org/patch/msgid/20231211081134.2698-1-ville.syrjala@linux.intel.com -Reviewed-by: Stanislav Lisovskiy -(cherry picked from commit e93bffc2ac0a833b42841f31fff955549d38ce98) -Signed-off-by: Jani Nikula -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_display.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -15761,6 +15761,17 @@ static void intel_atomic_track_fbs(struc - struct intel_plane *plane; - int i; - -+ /* -+ * FIXME: Bigjoiner+async flip is busted currently. -+ * Remove this check once the issues are fixed. -+ */ -+ if (new_crtc_state->bigjoiner_pipes) { -+ drm_dbg_kms(&i915->drm, -+ "[CRTC:%d:%s] async flip disallowed with bigjoiner\n", -+ crtc->base.base.id, crtc->base.name); -+ return -EINVAL; -+ } -+ - for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, - new_plane_state, i) - intel_frontbuffer_track(to_intel_frontbuffer(old_plane_state->hw.fb), diff --git a/queue-5.10/series b/queue-5.10/series index a5c00e0a346..79bfc12c1dd 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -44,4 +44,3 @@ net-9p-avoid-freeing-uninit-memory-in-p9pdu_vreadf.patch net-rfkill-gpio-set-gpio-direction.patch net-ks8851-fix-tx-stall-caused-by-tx-buffer-overrun.patch dt-bindings-nvmem-mxs-ocotp-document-fsl-ocotp.patch -drm-i915-reject-async-flips-with-bigjoiner.patch diff --git a/queue-5.15/drm-i915-reject-async-flips-with-bigjoiner.patch b/queue-5.15/drm-i915-reject-async-flips-with-bigjoiner.patch deleted file mode 100644 index 6fa17892310..00000000000 --- a/queue-5.15/drm-i915-reject-async-flips-with-bigjoiner.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 88a173e5dd05e788068e8fa20a8c37c44bd8f416 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Mon, 11 Dec 2023 10:11:34 +0200 -Subject: drm/i915: Reject async flips with bigjoiner -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 88a173e5dd05e788068e8fa20a8c37c44bd8f416 upstream. - -Currently async flips are busted when bigjoiner is in use. -As a short term fix simply reject async flips in that case. - -Cc: stable@vger.kernel.org -Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9769 -Signed-off-by: Ville Syrjälä -Link: https://patchwork.freedesktop.org/patch/msgid/20231211081134.2698-1-ville.syrjala@linux.intel.com -Reviewed-by: Stanislav Lisovskiy -(cherry picked from commit e93bffc2ac0a833b42841f31fff955549d38ce98) -Signed-off-by: Jani Nikula -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_display.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -9667,6 +9667,17 @@ static int intel_atomic_check_async(stru - } - } - -+ /* -+ * FIXME: Bigjoiner+async flip is busted currently. -+ * Remove this check once the issues are fixed. -+ */ -+ if (new_crtc_state->bigjoiner_pipes) { -+ drm_dbg_kms(&i915->drm, -+ "[CRTC:%d:%s] async flip disallowed with bigjoiner\n", -+ crtc->base.base.id, crtc->base.name); -+ return -EINVAL; -+ } -+ - for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, - new_plane_state, i) { - /* diff --git a/queue-5.15/series b/queue-5.15/series index 38e8a66692e..f4f223eddaa 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -55,4 +55,3 @@ net-9p-avoid-freeing-uninit-memory-in-p9pdu_vreadf.patch net-rfkill-gpio-set-gpio-direction.patch net-ks8851-fix-tx-stall-caused-by-tx-buffer-overrun.patch dt-bindings-nvmem-mxs-ocotp-document-fsl-ocotp.patch -drm-i915-reject-async-flips-with-bigjoiner.patch diff --git a/queue-5.4/drm-i915-reject-async-flips-with-bigjoiner.patch b/queue-5.4/drm-i915-reject-async-flips-with-bigjoiner.patch deleted file mode 100644 index 80bb3b262c8..00000000000 --- a/queue-5.4/drm-i915-reject-async-flips-with-bigjoiner.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 88a173e5dd05e788068e8fa20a8c37c44bd8f416 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Mon, 11 Dec 2023 10:11:34 +0200 -Subject: drm/i915: Reject async flips with bigjoiner -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 88a173e5dd05e788068e8fa20a8c37c44bd8f416 upstream. - -Currently async flips are busted when bigjoiner is in use. -As a short term fix simply reject async flips in that case. - -Cc: stable@vger.kernel.org -Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9769 -Signed-off-by: Ville Syrjälä -Link: https://patchwork.freedesktop.org/patch/msgid/20231211081134.2698-1-ville.syrjala@linux.intel.com -Reviewed-by: Stanislav Lisovskiy -(cherry picked from commit e93bffc2ac0a833b42841f31fff955549d38ce98) -Signed-off-by: Jani Nikula -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_display.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -14142,6 +14142,17 @@ static void intel_atomic_track_fbs(struc - struct intel_plane *plane; - int i; - -+ /* -+ * FIXME: Bigjoiner+async flip is busted currently. -+ * Remove this check once the issues are fixed. -+ */ -+ if (new_crtc_state->bigjoiner_pipes) { -+ drm_dbg_kms(&i915->drm, -+ "[CRTC:%d:%s] async flip disallowed with bigjoiner\n", -+ crtc->base.base.id, crtc->base.name); -+ return -EINVAL; -+ } -+ - for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, - new_plane_state, i) - intel_frontbuffer_track(to_intel_frontbuffer(old_plane_state->base.fb), diff --git a/queue-5.4/input-soc_button_array-add-mapping-for-airplane-mode-button.patch b/queue-5.4/input-soc_button_array-add-mapping-for-airplane-mode-button.patch deleted file mode 100644 index 6e3606fd227..00000000000 --- a/queue-5.4/input-soc_button_array-add-mapping-for-airplane-mode-button.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ea3715941a9b7d816a1e9096ac0577900af2a69e Mon Sep 17 00:00:00 2001 -From: Christoffer Sandberg -Date: Fri, 22 Dec 2023 23:25:38 -0800 -Subject: Input: soc_button_array - add mapping for airplane mode button - -From: Christoffer Sandberg - -commit ea3715941a9b7d816a1e9096ac0577900af2a69e upstream. - -This add a mapping for the airplane mode button on the TUXEDO Pulse Gen3. - -While it is physically a key it behaves more like a switch, sending a key -down on first press and a key up on 2nd press. Therefor the switch event -is used here. Besides this behaviour it uses the HID usage-id 0xc6 -(Wireless Radio Button) and not 0xc8 (Wireless Radio Slider Switch), but -since neither 0xc6 nor 0xc8 are currently implemented at all in -soc_button_array this not to standard behaviour is not put behind a quirk -for the moment. - -Signed-off-by: Christoffer Sandberg -Signed-off-by: Werner Sembach -Link: https://lore.kernel.org/r/20231215171718.80229-1-wse@tuxedocomputers.com -Cc: stable@vger.kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman ---- - drivers/input/misc/soc_button_array.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/input/misc/soc_button_array.c -+++ b/drivers/input/misc/soc_button_array.c -@@ -192,6 +192,11 @@ static int soc_button_parse_btn_desc(str - info->name = "power"; - info->event_code = KEY_POWER; - info->wakeup = true; -+ } else if (upage == 0x01 && usage == 0xc6) { -+ info->name = "airplane mode switch"; -+ info->event_type = EV_SW; -+ info->event_code = SW_RFKILL_ALL; -+ info->active_low = false; - } else if (upage == 0x01 && usage == 0xca) { - info->name = "rotation lock switch"; - info->event_type = EV_SW; diff --git a/queue-5.4/series b/queue-5.4/series index e117f59ffff..b25a5d73b81 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -36,7 +36,5 @@ usb-serial-option-add-quectel-eg912y-module-support.patch usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch -input-soc_button_array-add-mapping-for-airplane-mode-button.patch net-9p-avoid-freeing-uninit-memory-in-p9pdu_vreadf.patch net-rfkill-gpio-set-gpio-direction.patch -drm-i915-reject-async-flips-with-bigjoiner.patch