Merge 73a4620464 on remote branch

Change-Id: Id52f5b4d6aec018ca519cb444a01d959e46bc779
This commit is contained in:
Linux Build Service Account 2023-01-20 04:16:32 -08:00
commit 8b85f62bb9
2 changed files with 8 additions and 3 deletions

View file

@ -3558,6 +3558,12 @@ static int dsi_display_clocks_init(struct dsi_display *display)
num_clk = dsi_display_get_clocks_count(display, dsi_clock_name);
if (num_clk <= 0) {
rc = num_clk;
DSI_WARN("failed to read %s, rc = %d\n", dsi_clock_name, num_clk);
goto error;
}
DSI_DEBUG("clk count=%d\n", num_clk);
for (i = 0; i < num_clk; i++) {

View file

@ -368,9 +368,8 @@ static u32 sde_rsc_timer_calculate(struct sde_rsc_priv *rsc,
rsc_time_slot_0_ns = div_u64(rsc_time_slot_0_ns, cxo_period_ns);
rsc->timer_config.rsc_time_slot_0_ns = (u32) rsc_time_slot_0_ns;
/* time_slot_1 for mode1 latency */
rsc_time_slot_1_ns = frame_time_ns;
rsc_time_slot_1_ns = div_u64(rsc_time_slot_1_ns, cxo_period_ns);
/* time_slot_1 for mode1 latency - 1 fps */
rsc_time_slot_1_ns = div_u64(TICKS_IN_NANO_SECOND, cxo_period_ns);
rsc->timer_config.rsc_time_slot_1_ns = (u32) rsc_time_slot_1_ns;
/* mode 2 is infinite */