Skip to content

Commit

Permalink
drm/i915/display: correct dual pps handling for MTL_PCH+
Browse files Browse the repository at this point in the history
On the PCH side the second PPS was introduced in ICP+.Add condition
On MTL_PCH and greater platform also having the second PPS.

Note that DG1/2 south block only has the single PPS, so need
to exclude the fake DG1/2 PCHs

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11488
Fixes: 93cbc1a ("drm/i915/mtl: Add fake PCH for Meteor Lake")
Cc: <[email protected]> # v6.9+
Signed-off-by: Dnyaneshwar Bhadane <[email protected]>
Reviewed-by: Jani Nikula <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit da1878b)
Signed-off-by: Joonas Lahtinen <[email protected]>
Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/72
  • Loading branch information
bhadanednyaneshwar authored and heftig committed Aug 11, 2024
1 parent 4b4598a commit 1528b74
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/display/intel_backlight.c
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,9 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)

static int cnp_num_backlight_controllers(struct drm_i915_private *i915)
{
if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
return 2;

if (INTEL_PCH_TYPE(i915) >= PCH_DG1)
return 1;

Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/display/intel_pps.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,9 @@ static int intel_num_pps(struct drm_i915_private *i915)
if (IS_GEMINILAKE(i915) || IS_BROXTON(i915))
return 2;

if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
return 2;

if (INTEL_PCH_TYPE(i915) >= PCH_DG1)
return 1;

Expand Down

0 comments on commit 1528b74

Please sign in to comment.