On Tue, Feb 04, 2025 at 03:42:28PM +0200, Jani Nikula wrote:
> Switch the IS_<PLATFORM>() checks to display->platform.<platform>, and
> drop a number of struct drm_i915_private pointers in the process.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_cx0_phy.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> index 48b0b9755b2b..0ff76ef10d4b 100644
> --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> @@ -34,13 +34,13 @@
>
> bool intel_encoder_is_c10phy(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
> enum phy phy = intel_encoder_to_phy(encoder);
>
> - if (IS_PANTHERLAKE(i915) && phy == PHY_A)
> + if (display->platform.pantherlake && phy == PHY_A)
> return true;
>
> - if ((IS_LUNARLAKE(i915) || IS_METEORLAKE(i915)) && phy < PHY_C)
> + if ((display->platform.lunarlake || display->platform.meteorlake) && phy < PHY_C)
> return true;
>
> return false;
> @@ -3216,12 +3216,11 @@ void intel_mtl_pll_enable(struct intel_encoder *encoder,
> static u8 cx0_power_control_disable_val(struct intel_encoder *encoder)
> {
> struct intel_display *display = to_intel_display(encoder);
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>
> if (intel_encoder_is_c10phy(encoder))
> return CX0_P2PG_STATE_DISABLE;
>
> - if ((IS_BATTLEMAGE(i915) && encoder->port == PORT_A) ||
> + if ((display->platform.battlemage && encoder->port == PORT_A) ||
> (DISPLAY_VER(display) >= 30 && encoder->type == INTEL_OUTPUT_EDP))
> return CX0_P2PG_STATE_DISABLE;
>
> --
> 2.39.5
>
