Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d26d6f authored by Ritesh Kumar's avatar Ritesh Kumar
Browse files

disp: msm: dsi: Fix pll delay calculation during clock switch 



During clock switch, Pll delay is calculated considering escape
clock to be in KHz. But escape clock is in Hz. This leads to wrong
pll delay calculation.

Change-Id: I616d16cc3d775a37e77c7c35bb860c23b1f9e37a
Signed-off-by: default avatarRitesh Kumar <riteshk@codeaurora.org>
parent 452d137b

msm/dsi/dsi_clk.h

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _DSI_CLK_H_
@@ -105,10 +105,10 @@ struct dsi_link_lp_clk_info { 


/**

 * struct link_clk_freq - Clock frequency information for Link clocks

 * @byte_clk_rate:   Frequency of DSI byte_clk in KHz.

 * @byte_intf_clk_rate:   Frequency of DSI byte_intf_clk in KHz.

 * @pixel_clk_rate:  Frequency of DSI pixel_clk in KHz.

 * @esc_clk_rate:    Frequency of DSI escape clock in KHz.

 * @byte_clk_rate:   Frequency of DSI byte_clk in Hz.

 * @byte_intf_clk_rate:   Frequency of DSI byte_intf_clk in Hz.

 * @pixel_clk_rate:  Frequency of DSI pixel_clk in Hz.

 * @esc_clk_rate:    Frequency of DSI escape clock in Hz.

 */

struct link_clk_freq {

	u32 byte_clk_rate;

msm/dsi/dsi_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ struct dsi_cmd_engine_cfg { 
 * @common_config:         Host configuration common to both Video and Cmd mode.

 * @video_engine:          Video engine configuration if panel is in video mode.

 * @cmd_engine:            Cmd engine configuration if panel is in cmd mode.

 * @esc_clk_rate_khz:      Esc clock frequency in Hz.

 * @esc_clk_rate_hz:      Esc clock frequency in Hz.

 * @bit_clk_rate_hz:       Bit clock frequency in Hz.

 * @bit_clk_rate_hz_override: DSI bit clk rate override from dt/sysfs.

 * @video_timing:          Video timing information of a frame.

msm/dsi/dsi_display.c

+4 −4
Original line number Diff line number Diff line
@@ -4099,12 +4099,12 @@ static void _dsi_display_calc_pipe_delay(struct dsi_display *display, 


	cfg = &(m_ctrl->phy->cfg);



	esc_clk_rate_hz = dsi_ctrl->clk_freq.esc_clk_rate * 1000;

	pclk_to_esc_ratio = ((dsi_ctrl->clk_freq.pix_clk_rate * 1000) /

	esc_clk_rate_hz = dsi_ctrl->clk_freq.esc_clk_rate;

	pclk_to_esc_ratio = (dsi_ctrl->clk_freq.pix_clk_rate /

			     esc_clk_rate_hz);

	byte_to_esc_ratio = ((dsi_ctrl->clk_freq.byte_clk_rate * 1000) /

	byte_to_esc_ratio = (dsi_ctrl->clk_freq.byte_clk_rate /

			     esc_clk_rate_hz);

	hr_bit_to_esc_ratio = ((dsi_ctrl->clk_freq.byte_clk_rate * 4 * 1000) /

	hr_bit_to_esc_ratio = ((dsi_ctrl->clk_freq.byte_clk_rate * 4) /

					esc_clk_rate_hz);



	hsync_period = DSI_H_TOTAL_DSC(&mode->timing);