diff options
| author | Jonathon Hall <jonathon.hall@puri.sm> | 2024-03-13 16:54:25 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-03-18 12:55:18 +0300 |
| commit | 1ef48859317b2a77672dea8682df133abf9c44ed (patch) | |
| tree | 09e5bb4d211a21ba4adbf44ec5dd5c494cb5b93f /drivers/gpu/drm/i915/display/skl_scaler.c | |
| parent | 94273e122d0064b8ae7a70e7ce6ec3106d92f820 (diff) | |
| download | linux-1ef48859317b2a77672dea8682df133abf9c44ed.tar.xz | |
drm/i915: Do not match JSL in ehl_combo_pll_div_frac_wa_needed()
Since commit 0c65dc062611 ("drm/i915/jsl: s/JSL/JASPERLAKE for
platform/subplatform defines"), boot freezes on a Jasper Lake tablet
(Librem 11), usually with graphical corruption on the eDP display,
but sometimes just a black screen. This commit was included in 6.6 and
later.
That commit was intended to refactor EHL and JSL macros, but the change
to ehl_combo_pll_div_frac_wa_needed() started matching JSL incorrectly
when it was only intended to match EHL.
It replaced:
return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&
IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) ||
with:
return (((IS_ELKHARTLAKE(i915) || IS_JASPERLAKE(i915)) &&
IS_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) ||
Remove IS_JASPERLAKE() to fix the regression.
Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
Cc: stable@vger.kernel.org
Fixes: 0c65dc062611 ("drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines")
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240313135424.3731410-1-jonathon.hall@puri.sm
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/skl_scaler.c')
0 files changed, 0 insertions, 0 deletions