--- /dev/null
+From eb9719688fed2bb142638a2fbbe147e28e282974 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 26 Jan 2023 16:36:13 +0300
+Subject: Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
+
+From: Archie Pusaka <apusaka@chromium.org>
+
+commit 97dfaf073f5881c624856ef293be307b6166115c upstream.
+
+If a command is already sent, we take care of freeing it, but we
+also need to cancel the timeout as well.
+
+Signed-off-by: Archie Pusaka <apusaka@chromium.org>
+Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
+Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/bluetooth/hci_sync.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
+index 67dd4c9fa4a5..3eec688a88a9 100644
+--- a/net/bluetooth/hci_sync.c
++++ b/net/bluetooth/hci_sync.c
+@@ -4703,6 +4703,7 @@ int hci_dev_open_sync(struct hci_dev *hdev)
+ hdev->flush(hdev);
+
+ if (hdev->sent_cmd) {
++ cancel_delayed_work_sync(&hdev->cmd_timer);
+ kfree_skb(hdev->sent_cmd);
+ hdev->sent_cmd = NULL;
+ }
+--
+2.39.0
+
--- /dev/null
+From eced52da839c83a4a3216500be0f2a087b6a00be Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 27 Sep 2022 21:06:14 +0300
+Subject: drm/i915: Allow alternate fixed modes always for eDP
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+[ Upstream commit 55cfeecc2197de68e9cc30f77c711dcbcdf27510 ]
+
+Stop considering VBT's static DRRS support when deciding whether
+to use alternate fixed modes or not. It looks like Windows more
+or less just uses that to decide whether to automagically switch
+refresh rates on AC<->battery changes, or perhaps whether to
+even expose a control for that in some UI thing. Either way it
+seems happy to always use all EDID modes, and I guess the
+DRRS/VRR stuff more or less adjusts how said modes get
+actually used.
+
+Let's do the same and just accept all the suitable looking
+modes from EDID, whether we have DRRS or VRR.
+
+Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6323
+Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6484
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220927180615.25476-3-ville.syrjala@linux.intel.com
+Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/i915/display/intel_dp.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
+index 78b3427471bd..b94bcceeff70 100644
+--- a/drivers/gpu/drm/i915/display/intel_dp.c
++++ b/drivers/gpu/drm/i915/display/intel_dp.c
+@@ -5216,9 +5216,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ intel_bios_init_panel(dev_priv, &intel_connector->panel,
+ encoder->devdata, IS_ERR(edid) ? NULL : edid);
+
+- intel_panel_add_edid_fixed_modes(intel_connector,
+- intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE ||
+- intel_vrr_is_capable(intel_connector));
++ intel_panel_add_edid_fixed_modes(intel_connector, true);
+
+ /* MSO requires information from the EDID */
+ intel_edp_mso_init(intel_dp);
+--
+2.39.0
+
--- /dev/null
+From 57486875806e8d4b58fb741c544c625e2b316e7e Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 20 Oct 2022 12:39:38 +0300
+Subject: drm/i915: Allow panel fixed modes to have differing sync polarities
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+[ Upstream commit 2bd0db4b3f0bd529f75b32538fc5a3775e3591c0 ]
+
+Apparently some panels declare multiple modes with random
+sync polarities. Seems a bit weird, but looks like Windows/GOP
+doesn't care, so let follow suit and accept alternate fixed
+modes regardless of their sync polarities.
+
+v2: Don't pollute the DRM_ namespace with a define (Jani)
+
+Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6968
+Acked-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20221020093938.27200-1-ville.syrjala@linux.intel.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/i915/display/intel_panel.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
+index 41cec9dc4223..f72f4646c0d7 100644
+--- a/drivers/gpu/drm/i915/display/intel_panel.c
++++ b/drivers/gpu/drm/i915/display/intel_panel.c
+@@ -85,9 +85,10 @@ static bool is_alt_drrs_mode(const struct drm_display_mode *mode,
+ static bool is_alt_fixed_mode(const struct drm_display_mode *mode,
+ const struct drm_display_mode *preferred_mode)
+ {
+- return drm_mode_match(mode, preferred_mode,
+- DRM_MODE_MATCH_FLAGS |
+- DRM_MODE_MATCH_3D_FLAGS) &&
++ u32 sync_flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NHSYNC |
++ DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_NVSYNC;
++
++ return (mode->flags & ~sync_flags) == (preferred_mode->flags & ~sync_flags) &&
+ mode->hdisplay == preferred_mode->hdisplay &&
+ mode->vdisplay == preferred_mode->vdisplay;
+ }
+--
+2.39.0
+
arm64-efi-recover-from-synchronous-exceptions-occurr.patch
arm64-efi-avoid-workqueue-to-check-whether-efi-runti.patch
arm64-efi-account-for-the-efi-runtime-stack-in-stack.patch
+bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
+drm-i915-allow-panel-fixed-modes-to-have-differing-s.patch
+drm-i915-allow-alternate-fixed-modes-always-for-edp.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
