| Message ID | 20200109110835.29764-5-vandita.kulkarni@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for mipi dsi cmd mode | expand |
On Thu, 09 Jan 2020, Vandita Kulkarni <vandita.kulkarni@intel.com> wrote: > If the GOP has programmed periodic command mode, > we need to disable that which would need a > deconfigure and configure sequence. > > Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > index 66dc8be672b8..3ad8cedb5211 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -1378,6 +1378,21 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, > adjusted_mode->crtc_vblank_end = adjusted_mode->crtc_vtotal; > } > > +bool gen11_dsi_is_periodic_cmd_mode(struct drm_i915_private *dev_priv, > + struct intel_dsi *intel_dsi) Should be static (see sparse results). Please only pass intel_dsi, you can get at dev_priv through that. > +{ > + u32 val; > + enum transcoder dsi_trans; > + > + if (intel_dsi->ports == BIT(PORT_B)) > + dsi_trans = TRANSCODER_DSI_1; > + else > + dsi_trans = TRANSCODER_DSI_0; > + > + val = I915_READ(DSI_TRANS_FUNC_CONF(dsi_trans)); > + return (val & DSI_PERIODIC_FRAME_UPDATE_ENABLE); > +} > + > static void gen11_dsi_get_config(struct intel_encoder *encoder, > struct intel_crtc_state *pipe_config) > { > @@ -1398,6 +1413,10 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, > gen11_dsi_get_timings(encoder, pipe_config); > pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI); > pipe_config->pipe_bpp = bdw_get_pipemisc_bpp(crtc); > + > + if (gen11_dsi_is_periodic_cmd_mode(dev_priv, intel_dsi)) > + pipe_config->hw.adjusted_mode.private_flags |= > + I915_MODE_FLAG_DSI_PERIODIC_CMD_MODE; > } > > static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder, > @@ -1479,6 +1498,10 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, > > pipe_config->port_clock = afe_clk(encoder, pipe_config) / 5; > > + /* We would not opereate in peridoc command mode */ Spelling. Other than that, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > + pipe_config->hw.adjusted_mode.private_flags &= > + ~I915_MODE_FLAG_DSI_PERIODIC_CMD_MODE; > + > return 0; > }
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index 66dc8be672b8..3ad8cedb5211 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -1378,6 +1378,21 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, adjusted_mode->crtc_vblank_end = adjusted_mode->crtc_vtotal; } +bool gen11_dsi_is_periodic_cmd_mode(struct drm_i915_private *dev_priv, + struct intel_dsi *intel_dsi) +{ + u32 val; + enum transcoder dsi_trans; + + if (intel_dsi->ports == BIT(PORT_B)) + dsi_trans = TRANSCODER_DSI_1; + else + dsi_trans = TRANSCODER_DSI_0; + + val = I915_READ(DSI_TRANS_FUNC_CONF(dsi_trans)); + return (val & DSI_PERIODIC_FRAME_UPDATE_ENABLE); +} + static void gen11_dsi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { @@ -1398,6 +1413,10 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, gen11_dsi_get_timings(encoder, pipe_config); pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI); pipe_config->pipe_bpp = bdw_get_pipemisc_bpp(crtc); + + if (gen11_dsi_is_periodic_cmd_mode(dev_priv, intel_dsi)) + pipe_config->hw.adjusted_mode.private_flags |= + I915_MODE_FLAG_DSI_PERIODIC_CMD_MODE; } static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder, @@ -1479,6 +1498,10 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->port_clock = afe_clk(encoder, pipe_config) / 5; + /* We would not opereate in peridoc command mode */ + pipe_config->hw.adjusted_mode.private_flags &= + ~I915_MODE_FLAG_DSI_PERIODIC_CMD_MODE; + return 0; }
If the GOP has programmed periodic command mode, we need to disable that which would need a deconfigure and configure sequence. Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> --- drivers/gpu/drm/i915/display/icl_dsi.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)