From 841594cf7a3feddd051dabc43329cd7b59422da4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 25 Jun 2022 16:50:30 +0200 Subject: [PATCH] 5.15-stable patches added patches: drm-i915-implement-w-a-22010492432-for-adl-s.patch --- ...-implement-w-a-22010492432-for-adl-s.patch | 46 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-5.15/drm-i915-implement-w-a-22010492432-for-adl-s.patch diff --git a/queue-5.15/drm-i915-implement-w-a-22010492432-for-adl-s.patch b/queue-5.15/drm-i915-implement-w-a-22010492432-for-adl-s.patch new file mode 100644 index 00000000000..44d02866fd9 --- /dev/null +++ b/queue-5.15/drm-i915-implement-w-a-22010492432-for-adl-s.patch @@ -0,0 +1,46 @@ +From 13bd259b64bb58ae130923ada42ebc19bf3f2fa2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Mon, 13 Jun 2022 23:14:39 +0300 +Subject: drm/i915: Implement w/a 22010492432 for adl-s +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ville Syrjälä + +commit 13bd259b64bb58ae130923ada42ebc19bf3f2fa2 upstream. + +adl-s needs the combo PLL DCO fraction w/a as well. +Gets us slightly more accurate clock out of the PLL. + +Cc: stable@vger.kernel.org +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20220613201439.23341-1-ville.syrjala@linux.intel.com +Reviewed-by: Matt Roper +(cherry picked from commit d36bdd77b9e6aa7f5cb7b0f11ebbab8e5febf10b) +Signed-off-by: Jani Nikula +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c ++++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +@@ -2434,7 +2434,7 @@ static void icl_wrpll_params_populate(st + } + + /* +- * Display WA #22010492432: ehl, tgl, adl-p ++ * Display WA #22010492432: ehl, tgl, adl-s, adl-p + * Program half of the nominal DCO divider fraction value. + */ + static bool +@@ -2442,7 +2442,7 @@ ehl_combo_pll_div_frac_wa_needed(struct + { + return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) && + IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) || +- IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) && ++ IS_TIGERLAKE(i915) || IS_ALDERLAKE_S(i915) || IS_ALDERLAKE_P(i915)) && + i915->dpll.ref_clks.nssc == 38400; + } + diff --git a/queue-5.15/series b/queue-5.15/series index eb55067c970..834c2d5fd84 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -25,3 +25,4 @@ ata-libata-add-qc-flags-in-ata_qc_complete_template-tracepoint.patch dm-era-commit-metadata-in-postsuspend-after-worker-stops.patch dm-mirror-log-clear-log-bits-up-to-bits_per_long-boundary.patch tracing-kprobes-check-whether-get_kretprobe-returns-null-in-kretprobe_dispatcher.patch +drm-i915-implement-w-a-22010492432-for-adl-s.patch -- 2.47.3