On Mon, 03 Feb 2020, Vandita Kulkarni <vandita.kulka...@intel.com> wrote:
> Transcoder timing calculation differ for command mode.
>
> v2: Use is_vid_mode, and use same I915_WRITE (Jani)
> v3: Adjust the calculations to reflect dsc compression ratio
> v4: Rearrange the vertical and horizontal timing calc, optimize
> local variables usage. (Jani)
>
> Signed-off-by: Vandita Kulkarni <vandita.kulka...@intel.com>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 56 +++++++++++++++++---------
> 1 file changed, 38 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c
> b/drivers/gpu/drm/i915/display/icl_dsi.c
> index ce5e38c16201..04df45d627b2 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -849,14 +849,31 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder
> *encoder,
> }
>
> hactive = adjusted_mode->crtc_hdisplay;
> - htotal = DIV_ROUND_UP(adjusted_mode->crtc_htotal * mul, div);
> + vactive = adjusted_mode->crtc_vdisplay;
Please don't move vactive, keep it where it is.
> +
> + /* horizonatal timings */
Not needed, especially with the typo... ;)
> + if (is_vid_mode(intel_dsi))
> + htotal = adjusted_mode->crtc_htotal;
> + else
> + htotal = hactive + 160;
What is the 160 pixels based on?
> + htotal = DIV_ROUND_UP(htotal * mul, div);
I think it's clearer to duplicate the full formula for both video mode
and command mode, instead of assigning a temp value to htotal.
> hsync_start = DIV_ROUND_UP(adjusted_mode->crtc_hsync_start * mul, div);
> hsync_end = DIV_ROUND_UP(adjusted_mode->crtc_hsync_end * mul, div);
> hsync_size = hsync_end - hsync_start;
> hback_porch = (adjusted_mode->crtc_htotal -
> adjusted_mode->crtc_hsync_end);
> - vactive = adjusted_mode->crtc_vdisplay;
> - vtotal = adjusted_mode->crtc_vtotal;
> +
> + /*vertical timings */
Not needed.
> + if (is_vid_mode(intel_dsi)) {
> + vtotal = adjusted_mode->crtc_vtotal;
> + } else {
> + int bpp, line_time_us, byte_clk_period_ns;
> +
> + bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
> + byte_clk_period_ns = 8 * 1000000 / intel_dsi->pclk;
> + line_time_us = (htotal * (bpp / 8) * byte_clk_period_ns) /
> (1000 * intel_dsi->lane_count);
Mmh, you can get the 8X clock with afe_clk() right? Cleaner to start
with that?
> + vtotal = vactive + DIV_ROUND_UP(460, line_time_us);
Ugh, the bspec definition says 400 us, and the example has 460 us.
> + }
> vsync_start = adjusted_mode->crtc_vsync_start;
> vsync_end = adjusted_mode->crtc_vsync_end;
> vsync_shift = hsync_start - htotal / 2;
> @@ -885,7 +902,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder
> *encoder,
> }
>
> /* TRANS_HSYNC register to be programmed only for video mode */
> - if (intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE) {
> + if (is_vid_mode(intel_dsi)) {
> if (intel_dsi->video_mode_format ==
> VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE) {
> /* BSPEC: hsync size should be atleast 16 pixels */
> @@ -909,13 +926,12 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder
> *encoder,
> }
> }
>
> - /* program TRANS_VTOTAL register */
Unrelated change.
> for_each_dsi_port(port, intel_dsi->ports) {
> dsi_trans = dsi_port_to_transcoder(port);
> /*
> - * FIXME: Programing this by assuming progressive mode, since
> - * non-interlaced info from VBT is not saved inside
> - * struct drm_display_mode.
> + * FIXME: Programing this by assuming progressive mode,
> + * since non-interlaced info from VBT is not saved
> + * inside struct drm_display_mode.
Unrelated change.
> * For interlace mode: program required pixel minus 2
> */
> intel_de_write(dev_priv, VTOTAL(dsi_trans),
> @@ -928,22 +944,26 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder
> *encoder,
> if (vsync_start < vactive)
> drm_err(&dev_priv->drm, "vsync_start less than vactive\n");
>
> - /* program TRANS_VSYNC register */
> - for_each_dsi_port(port, intel_dsi->ports) {
> - dsi_trans = dsi_port_to_transcoder(port);
> - intel_de_write(dev_priv, VSYNC(dsi_trans),
> - (vsync_start - 1) | ((vsync_end - 1) << 16));
> + /* program TRANS_VSYNC register for video mode only */
> + if (is_vid_mode(intel_dsi)) {
> + for_each_dsi_port(port, intel_dsi->ports) {
> + dsi_trans = dsi_port_to_transcoder(port);
> + I915_WRITE(VSYNC(dsi_trans),
Please stick to intel_de_write().
> + (vsync_start - 1) | ((vsync_end - 1) << 16));
> + }
> }
>
> /*
> - * FIXME: It has to be programmed only for interlaced
> + * FIXME: It has to be programmed only for video modes and interlaced
> * modes. Put the check condition here once interlaced
> * info available as described above.
> * program TRANS_VSYNCSHIFT register
> */
> - for_each_dsi_port(port, intel_dsi->ports) {
> - dsi_trans = dsi_port_to_transcoder(port);
> - intel_de_write(dev_priv, VSYNCSHIFT(dsi_trans), vsync_shift);
> + if (is_vid_mode(intel_dsi)) {
> + for_each_dsi_port(port, intel_dsi->ports) {
> + dsi_trans = dsi_port_to_transcoder(port);
> + I915_WRITE(VSYNCSHIFT(dsi_trans), vsync_shift);
intel_de_write().
> + }
> }
>
> /* program TRANS_VBLANK register, should be same as vtotal programmed */
> @@ -1032,7 +1052,7 @@ static void gen11_dsi_config_util_pin(struct
> intel_encoder *encoder,
> bool enable)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
> + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
Ah, this fixup hunk belongs to patch 1, not here.
> u32 tmp;
>
> /*
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
