On Fri, 18 Feb 2022, Jani Nikula <jani.nik...@intel.com> wrote:
> The VBT DSI video transfer mode field values have been defined in terms
> of the VLV MIPI_VIDEO_MODE_FORMAT register. The ICL DSI code maps that
> to ICL DSI_TRANS_FUNC_CONF() register. The values are the same, though
> the shift is different.
>
> Make a clean break and disassociate the values from each other. Assume
> the values can be different, and translate the VBT value to VLV and ICL
> register values as needed. Use the existing macros from intel_bios.h.
>
> This will be useful in splitting the DSI register macros to files by DSI
> implementation.
>
> Cc: Matt Roper <matthew.d.ro...@intel.com>
> Reviewed-by: Matt Roper <matthew.d.ro...@intel.com>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>

Thanks for the review, pushed to din.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/display/icl_dsi.c       | 11 +++----
>  drivers/gpu/drm/i915/display/intel_dsi.h     |  4 +--
>  drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 10 +++---
>  drivers/gpu/drm/i915/display/vlv_dsi.c       | 33 ++++++++++++++++----
>  4 files changed, 39 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c 
> b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 2d5bb9195b20..479d5e1165d9 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -788,14 +788,14 @@ gen11_dsi_configure_transcoder(struct intel_encoder 
> *encoder,
>               /* program DSI operation mode */
>               if (is_vid_mode(intel_dsi)) {
>                       tmp &= ~OP_MODE_MASK;
> -                     switch (intel_dsi->video_mode_format) {
> +                     switch (intel_dsi->video_mode) {
>                       default:
> -                             MISSING_CASE(intel_dsi->video_mode_format);
> +                             MISSING_CASE(intel_dsi->video_mode);
>                               fallthrough;
> -                     case VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS:
> +                     case NON_BURST_SYNC_EVENTS:
>                               tmp |= VIDEO_MODE_SYNC_EVENT;
>                               break;
> -                     case VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE:
> +                     case NON_BURST_SYNC_PULSE:
>                               tmp |= VIDEO_MODE_SYNC_PULSE;
>                               break;
>                       }
> @@ -960,8 +960,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder 
> *encoder,
>  
>       /* TRANS_HSYNC register to be programmed only for video mode */
>       if (is_vid_mode(intel_dsi)) {
> -             if (intel_dsi->video_mode_format ==
> -                 VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE) {
> +             if (intel_dsi->video_mode == NON_BURST_SYNC_PULSE) {
>                       /* BSPEC: hsync size should be atleast 16 pixels */
>                       if (hsync_size < 16)
>                               drm_err(&dev_priv->drm,
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi.h 
> b/drivers/gpu/drm/i915/display/intel_dsi.h
> index a3a906cb097e..eafef0a87fea 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi.h
> +++ b/drivers/gpu/drm/i915/display/intel_dsi.h
> @@ -79,8 +79,8 @@ struct intel_dsi {
>        */
>       enum mipi_dsi_pixel_format pixel_format;
>  
> -     /* video mode format for MIPI_VIDEO_MODE_FORMAT register */
> -     u32 video_mode_format;
> +     /* NON_BURST_SYNC_PULSE, NON_BURST_SYNC_EVENTS, or BURST_MODE */
> +     int video_mode;
>  
>       /* eot for MIPI_EOT_DISABLE register */
>       u8 eotp_pkt;
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c 
> b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> index a85574c413e8..a1cd86e53e21 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> @@ -675,11 +675,11 @@ void intel_dsi_log_params(struct intel_dsi *intel_dsi)
>       drm_dbg_kms(&i915->drm, "Lane count %d\n", intel_dsi->lane_count);
>       drm_dbg_kms(&i915->drm, "DPHY param reg 0x%x\n", intel_dsi->dphy_reg);
>       drm_dbg_kms(&i915->drm, "Video mode format %s\n",
> -                 intel_dsi->video_mode_format == 
> VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE ?
> +                 intel_dsi->video_mode == NON_BURST_SYNC_PULSE ?
>                   "non-burst with sync pulse" :
> -                 intel_dsi->video_mode_format == 
> VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS ?
> +                 intel_dsi->video_mode == NON_BURST_SYNC_EVENTS ?
>                   "non-burst with sync events" :
> -                 intel_dsi->video_mode_format == VIDEO_MODE_BURST ?
> +                 intel_dsi->video_mode == BURST_MODE ?
>                   "burst" : "<unknown>");
>       drm_dbg_kms(&i915->drm, "Burst mode ratio %d\n",
>                   intel_dsi->burst_mode_ratio);
> @@ -739,7 +739,7 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 
> panel_id)
>       intel_dsi->dual_link = mipi_config->dual_link;
>       intel_dsi->pixel_overlap = mipi_config->pixel_overlap;
>       intel_dsi->operation_mode = mipi_config->is_cmd_mode;
> -     intel_dsi->video_mode_format = mipi_config->video_transfer_mode;
> +     intel_dsi->video_mode = mipi_config->video_transfer_mode;
>       intel_dsi->escape_clk_div = mipi_config->byte_clk_sel;
>       intel_dsi->lp_rx_timeout = mipi_config->lp_rx_timeout;
>       intel_dsi->hs_tx_timeout = mipi_config->hs_tx_timeout;
> @@ -770,7 +770,7 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 
> panel_id)
>        * Target ddr frequency from VBT / non burst ddr freq
>        * multiply by 100 to preserve remainder
>        */
> -     if (intel_dsi->video_mode_format == VIDEO_MODE_BURST) {
> +     if (intel_dsi->video_mode == BURST_MODE) {
>               if (mipi_config->target_burst_mode_freq) {
>                       u32 bitrate = intel_dsi_bitrate(intel_dsi);
>  
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c 
> b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 20141f33ed64..f0c38173491e 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1492,7 +1492,7 @@ static void intel_dsi_prepare(struct intel_encoder 
> *intel_encoder,
>                */
>  
>               if (is_vid_mode(intel_dsi) &&
> -                     intel_dsi->video_mode_format == VIDEO_MODE_BURST) {
> +                     intel_dsi->video_mode == BURST_MODE) {
>                       intel_de_write(dev_priv, MIPI_HS_TX_TIMEOUT(port),
>                                      txbyteclkhs(adjusted_mode->crtc_htotal, 
> bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1);
>               } else {
> @@ -1568,12 +1568,33 @@ static void intel_dsi_prepare(struct intel_encoder 
> *intel_encoder,
>               intel_de_write(dev_priv, MIPI_CLK_LANE_SWITCH_TIME_CNT(port),
>                              intel_dsi->clk_lp_to_hs_count << 
> LP_HS_SSW_CNT_SHIFT | intel_dsi->clk_hs_to_lp_count << 
> HS_LP_PWR_SW_CNT_SHIFT);
>  
> -             if (is_vid_mode(intel_dsi))
> -                     /* Some panels might have resolution which is not a
> +             if (is_vid_mode(intel_dsi)) {
> +                     u32 fmt = intel_dsi->video_frmt_cfg_bits | IP_TG_CONFIG;
> +
> +                     /*
> +                      * Some panels might have resolution which is not a
>                        * multiple of 64 like 1366 x 768. Enable RANDOM
> -                      * resolution support for such panels by default */
> -                     intel_de_write(dev_priv, MIPI_VIDEO_MODE_FORMAT(port),
> -                                    intel_dsi->video_frmt_cfg_bits | 
> intel_dsi->video_mode_format | IP_TG_CONFIG | RANDOM_DPI_DISPLAY_RESOLUTION);
> +                      * resolution support for such panels by default.
> +                      */
> +                     fmt |= RANDOM_DPI_DISPLAY_RESOLUTION;
> +
> +                     switch (intel_dsi->video_mode) {
> +                     default:
> +                             MISSING_CASE(intel_dsi->video_mode);
> +                             fallthrough;
> +                     case NON_BURST_SYNC_EVENTS:
> +                             fmt |= VIDEO_MODE_NON_BURST_WITH_SYNC_EVENTS;
> +                             break;
> +                     case NON_BURST_SYNC_PULSE:
> +                             fmt |= VIDEO_MODE_NON_BURST_WITH_SYNC_PULSE;
> +                             break;
> +                     case BURST_MODE:
> +                             fmt |= VIDEO_MODE_BURST;
> +                             break;
> +                     }
> +
> +                     intel_de_write(dev_priv, MIPI_VIDEO_MODE_FORMAT(port), 
> fmt);
> +             }
>       }
>  }

-- 
Jani Nikula, Intel Open Source Graphics Center

Reply via email to