| Message ID | bf3b0fb17595eb483597f2dd6d14f861656eba01.1574775655.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dsi: enable DSC | expand |
> -----Original Message----- > From: Jani Nikula <jani.nikula@intel.com> > Sent: Tuesday, November 26, 2019 7:13 PM > To: intel-gfx@lists.freedesktop.org > Cc: Nikula, Jani <jani.nikula@intel.com>; Kulkarni, Vandita > <vandita.kulkarni@intel.com>; Ville Syrjälä <ville.syrjala@linux.intel.com> > Subject: [PATCH v3 09/13] drm/i915/dsi: use afe_clk() instead of > intel_dsi_bitrate() > > We'll be expanding afe_clk() to take DSC into account. Switch to using it > where DSC matters. Which is really everywhere that > intel_dsi_bitrate() is currently used in ICL DSI code. > > The functional difference is that we round the result closest instead of > down. > > Cc: Vandita Kulkarni <vandita.kulkarni@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Looks good to me. Reviewed-by: Vandita Kulkarni <vandita.kulkarni@intel.com> Regards, Vandita > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c > b/drivers/gpu/drm/i915/display/icl_dsi.c > index de3743233dcb..d576f29cef75 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -539,7 +539,7 @@ static void gen11_dsi_setup_dphy_timings(struct > intel_encoder *encoder) > * leave all fields at HW default values. > */ > if (IS_GEN(dev_priv, 11)) { > - if (intel_dsi_bitrate(intel_dsi) <= 800000) { > + if (afe_clk(encoder) <= 800000) { > for_each_dsi_port(port, intel_dsi->ports) { > tmp = > I915_READ(DPHY_TA_TIMING_PARAM(port)); > tmp &= ~TA_SURE_MASK; > @@ -649,7 +649,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder > *encoder, > tmp |= EOTP_DISABLED; > > /* enable link calibration if freq > 1.5Gbps */ > - if (intel_dsi_bitrate(intel_dsi) >= 1500 * 1000) { > + if (afe_clk(encoder) >= 1500 * 1000) { > tmp &= ~LINK_CALIBRATION_MASK; > tmp |= CALIBRATION_ENABLED_INITIAL_ONLY; > } > @@ -930,7 +930,7 @@ static void gen11_dsi_setup_timeouts(struct > intel_encoder *encoder) > * TIME_NS = (BYTE_CLK_COUNT * 8 * 10^6)/ Bitrate > * ESCAPE_CLK_COUNT = TIME_NS/ESC_CLK_NS > */ > - divisor = intel_dsi_tlpx_ns(intel_dsi) * intel_dsi_bitrate(intel_dsi) * > 1000; > + divisor = intel_dsi_tlpx_ns(intel_dsi) * afe_clk(encoder) * 1000; > mul = 8 * 1000000; > hs_tx_timeout = DIV_ROUND_UP(intel_dsi->hs_tx_timeout * mul, > divisor); > @@ -1300,7 +1300,7 @@ static int gen11_dsi_compute_config(struct > intel_encoder *encoder, > pipe_config->pipe_bpp = 18; > > pipe_config->clock_set = true; > - pipe_config->port_clock = intel_dsi_bitrate(intel_dsi) / 5; > + pipe_config->port_clock = afe_clk(encoder) / 5; > > return 0; > } > -- > 2.20.1
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index de3743233dcb..d576f29cef75 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -539,7 +539,7 @@ static void gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder) * leave all fields at HW default values. */ if (IS_GEN(dev_priv, 11)) { - if (intel_dsi_bitrate(intel_dsi) <= 800000) { + if (afe_clk(encoder) <= 800000) { for_each_dsi_port(port, intel_dsi->ports) { tmp = I915_READ(DPHY_TA_TIMING_PARAM(port)); tmp &= ~TA_SURE_MASK; @@ -649,7 +649,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, tmp |= EOTP_DISABLED; /* enable link calibration if freq > 1.5Gbps */ - if (intel_dsi_bitrate(intel_dsi) >= 1500 * 1000) { + if (afe_clk(encoder) >= 1500 * 1000) { tmp &= ~LINK_CALIBRATION_MASK; tmp |= CALIBRATION_ENABLED_INITIAL_ONLY; } @@ -930,7 +930,7 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder) * TIME_NS = (BYTE_CLK_COUNT * 8 * 10^6)/ Bitrate * ESCAPE_CLK_COUNT = TIME_NS/ESC_CLK_NS */ - divisor = intel_dsi_tlpx_ns(intel_dsi) * intel_dsi_bitrate(intel_dsi) * 1000; + divisor = intel_dsi_tlpx_ns(intel_dsi) * afe_clk(encoder) * 1000; mul = 8 * 1000000; hs_tx_timeout = DIV_ROUND_UP(intel_dsi->hs_tx_timeout * mul, divisor); @@ -1300,7 +1300,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->pipe_bpp = 18; pipe_config->clock_set = true; - pipe_config->port_clock = intel_dsi_bitrate(intel_dsi) / 5; + pipe_config->port_clock = afe_clk(encoder) / 5; return 0; }
We'll be expanding afe_clk() to take DSC into account. Switch to using it where DSC matters. Which is really everywhere that intel_dsi_bitrate() is currently used in ICL DSI code. The functional difference is that we round the result closest instead of down. Cc: Vandita Kulkarni <vandita.kulkarni@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/icl_dsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)