Skip to content

Commit 1b85bdb

Browse files
bhadanednyaneshwarjlahtine-intel
authored andcommitted
drm/i915/display: correct dual pps handling for MTL_PCH+
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: <stable@vger.kernel.org> # v6.9+ Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240801111141.574854-1-dnyaneshwar.bhadane@intel.com (cherry picked from commit da1878b) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent de9c2c6 commit 1b85bdb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

drivers/gpu/drm/i915/display/intel_backlight.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,9 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
14491449

14501450
static int cnp_num_backlight_controllers(struct drm_i915_private *i915)
14511451
{
1452+
if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
1453+
return 2;
1454+
14521455
if (INTEL_PCH_TYPE(i915) >= PCH_DG1)
14531456
return 1;
14541457

drivers/gpu/drm/i915/display/intel_pps.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,9 @@ static int intel_num_pps(struct drm_i915_private *i915)
351351
if (IS_GEMINILAKE(i915) || IS_BROXTON(i915))
352352
return 2;
353353

354+
if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
355+
return 2;
356+
354357
if (INTEL_PCH_TYPE(i915) >= PCH_DG1)
355358
return 1;
356359

0 commit comments

Comments
 (0)