On Thu, Apr 19, 2018 at 11:59:39AM +0300, Jani Nikula wrote:
> Move the limit checks near the calculations for each field, and actually
> log the values that exceed limits.
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dsi_vbt.c | 34 ++++++++++++++++++----------------
> 1 file changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi_vbt.c b/drivers/gpu/drm/i915/intel_dsi_vbt.c
> index 91c07b0c8db9..4d6ffa7b3e7b 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_vbt.c
> +++ b/drivers/gpu/drm/i915/intel_dsi_vbt.c
> @@ -647,6 +647,11 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id)
> /* prepare count */
> prepare_cnt = DIV_ROUND_UP(ths_prepare_ns * ui_den, ui_num * mul);
>
> + if (prepare_cnt > PREPARE_CNT_MAX) {
> + DRM_DEBUG_KMS("prepare count too high %u\n", prepare_cnt);
> + prepare_cnt = PREPARE_CNT_MAX;
> + }
> +
> /* exit zero count */
> exit_zero_cnt = DIV_ROUND_UP(
> (ths_prepare_hszero - ths_prepare_ns) * ui_den,
> @@ -662,32 +667,29 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id)
> if (exit_zero_cnt < (55 * ui_den / ui_num) && (55 * ui_den) % ui_num)
> exit_zero_cnt += 1;
>
> + if (exit_zero_cnt > EXIT_ZERO_CNT_MAX) {
> + DRM_DEBUG_KMS("exit zero count too high %u\n", exit_zero_cnt);
> + exit_zero_cnt = EXIT_ZERO_CNT_MAX;
> + }
> +
> /* clk zero count */
> clk_zero_cnt = DIV_ROUND_UP(
> (tclk_prepare_clkzero - ths_prepare_ns)
> * ui_den, ui_num * mul);
>
> + if (clk_zero_cnt > CLK_ZERO_CNT_MAX) {
> + DRM_DEBUG_KMS("clock zero count too high %u\n", clk_zero_cnt);
> + clk_zero_cnt = CLK_ZERO_CNT_MAX;
> + }
> +
> /* trail count */
> tclk_trail_ns = max(mipi_config->tclk_trail, mipi_config->ths_trail);
> trail_cnt = DIV_ROUND_UP(tclk_trail_ns * ui_den, ui_num * mul);
>
> - if (prepare_cnt > PREPARE_CNT_MAX ||
> - exit_zero_cnt > EXIT_ZERO_CNT_MAX ||
> - clk_zero_cnt > CLK_ZERO_CNT_MAX ||
> - trail_cnt > TRAIL_CNT_MAX)
> - DRM_DEBUG_DRIVER("Values crossing maximum limits, restricting to max values\n");
> -
> - if (prepare_cnt > PREPARE_CNT_MAX)
> - prepare_cnt = PREPARE_CNT_MAX;
> -
> - if (exit_zero_cnt > EXIT_ZERO_CNT_MAX)
> - exit_zero_cnt = EXIT_ZERO_CNT_MAX;
> -
> - if (clk_zero_cnt > CLK_ZERO_CNT_MAX)
> - clk_zero_cnt = CLK_ZERO_CNT_MAX;
> -
> - if (trail_cnt > TRAIL_CNT_MAX)
> + if (trail_cnt > TRAIL_CNT_MAX) {
> + DRM_DEBUG_KMS("trail count too high %u\n", trail_cnt);
> trail_cnt = TRAIL_CNT_MAX;
> + }
>
> /* B080 */
> intel_dsi->dphy_reg = exit_zero_cnt << 24 | trail_cnt << 16 |
> --
> 2.11.0
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
