]> Git Repo - linux.git/commit
drm/i915: Do not match JSL in ehl_combo_pll_div_frac_wa_needed()
authorJonathon Hall <[email protected]>
Wed, 13 Mar 2024 13:54:25 +0000 (09:54 -0400)
committerRodrigo Vivi <[email protected]>
Thu, 28 Mar 2024 16:16:16 +0000 (12:16 -0400)
commite41d769f1a7a1dc533c35ef7b366be3dbf432a1c
tree6d735e0163f8dfc55ea26ba237da8e5dc35abcdf
parentb212b79768ccde74429f872c37618c543fa11333
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 <[email protected]>
Cc: [email protected]
Fixes: 0c65dc062611 ("drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines")
Reviewed-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Jani Nikula <[email protected]>
(cherry picked from commit 1ef48859317b2a77672dea8682df133abf9c44ed)
Signed-off-by: Rodrigo Vivi <[email protected]>
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
This page took 0.049615 seconds and 4 git commands to generate.