> Subject: [PATCH 18/32] drm/i915/xe3p_lpd: Drop support for interlace mode > > From: Ankit Nautiyal <[email protected]> > > Interlace mode is officially removed from HW from Xe3p_LPD. The register > TRANS_VSYNCSHIFT and the bits in TRANS_CONF are now removed, so make > sure we do not set/get these anymore. > > Bspec: 69961, 70000 > Signed-off-by: Ankit Nautiyal <[email protected]> > Signed-off-by: Gustavo Sousa <[email protected]>
LGTM, Reviewed-by: Suraj Kandpal <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index d5b2612d4ec2..6ac718192e1c 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -2631,7 +2631,7 @@ static void intel_set_transcoder_timings(const struct > intel_crtc_state *crtc_sta > crtc_vblank_start = 1; > } > > - if (DISPLAY_VER(display) >= 4) > + if (DISPLAY_VER(display) >= 4 && DISPLAY_VER(display) < 35) > intel_de_write(display, > TRANS_VSYNCSHIFT(display, cpu_transcoder), > vsyncshift); > @@ -2769,7 +2769,7 @@ static bool intel_pipe_is_interlaced(const struct > intel_crtc_state *crtc_state) > struct intel_display *display = to_intel_display(crtc_state); > enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; > > - if (DISPLAY_VER(display) == 2) > + if (DISPLAY_VER(display) == 2 || DISPLAY_VER(display) >= 35) > return false; > > if (DISPLAY_VER(display) >= 9 || > @@ -3160,10 +3160,12 @@ static void hsw_set_transconf(const struct > intel_crtc_state *crtc_state) > if (display->platform.haswell && crtc_state->dither) > val |= TRANSCONF_DITHER_EN | > TRANSCONF_DITHER_TYPE_SP; > > - if (crtc_state->hw.adjusted_mode.flags & > DRM_MODE_FLAG_INTERLACE) > - val |= TRANSCONF_INTERLACE_IF_ID_ILK; > - else > - val |= TRANSCONF_INTERLACE_PF_PD_ILK; > + if (DISPLAY_VER(display) < 35) { > + if (crtc_state->hw.adjusted_mode.flags & > DRM_MODE_FLAG_INTERLACE) > + val |= TRANSCONF_INTERLACE_IF_ID_ILK; > + else > + val |= TRANSCONF_INTERLACE_PF_PD_ILK; > + } > > if (display->platform.haswell && > crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB) > > -- > 2.51.0
