[PATCH] drm/i915/display: correct dual pps handling for MTL_PCH+

[Jani Nikula]

On Thu, 01 Aug 2024, Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com> wrote:
> 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
>
> Link: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11488

Closes:, not Link:

Fixes: 93cbc1accbce ("drm/i915/mtl: Add fake PCH for Meteor Lake")
Cc: <stable at vger.kernel.org> # v6.9+

Can be fixed while applying, no need to resend.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_backlight.c | 3 +++
>  drivers/gpu/drm/i915/display/intel_pps.c       | 3 +++
>  2 files changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
> index 071668bfe5d1..6c3333136737 100644
> --- a/drivers/gpu/drm/i915/display/intel_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c
> @@ -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;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
> index 42306bc4ba86..7ce926241e83 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -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;

-- 
Jani Nikula, Intel