Merge "msm: mdss: fix NOC error in accessing accessing DMA status reg" (abb022f7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdp3_ctrl.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -300,11 +300,12 @@ void vsync_count_down(void *arg)
		{
		struct mdp3_session_data session = (struct mdp3_session_data )arg;
		/* We are counting down to turn off clocks */
		if (atomic_read(&session->vsync_countdown) > 0)
		if (atomic_read(&session->vsync_countdown) > 0) {
		atomic_dec(&session->vsync_countdown);
		if (atomic_read(&session->vsync_countdown) == 0)
		schedule_work(&session->clk_off_work);
		}
		}

		void mdp3_ctrl_reset_countdown(struct mdp3_session_data *session,
		struct msm_fb_data_type *mfd)
		@@ -908,6 +909,11 @@ static int mdp3_ctrl_dma_init(struct msm_fb_data_type *mfd,
		te.hw_vsync_mode = panel_info->mipi.hw_vsync_mode;
		te.tear_check_en = panel_info->te.tear_check_en;
		te.sync_cfg_height = panel_info->te.sync_cfg_height;
		/* For mdp3, max. value of CFG_HEIGHT is 0x7ff,
		* for mdp5, max. value of CFG_HEIGHT is 0xffff.
		*/
		if (te.sync_cfg_height > 0x7ff)
		te.sync_cfg_height = 0x7ff;
		te.vsync_init_val = panel_info->te.vsync_init_val;
		te.sync_threshold_start = panel_info->te.sync_threshold_start;
		te.sync_threshold_continue = panel_info->te.sync_threshold_continue;

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ int mdp3_dma_sync_config(struct mdp3_dma *dma,

		vsync_clk_speed_hz = MDP_VSYNC_CLK_RATE;

		cfg = total_lines << VSYNC_TOTAL_LINES_SHIFT;
		cfg = te->sync_cfg_height << VSYNC_TOTAL_LINES_SHIFT;
		total_lines *= te->frame_rate;

		vclks_line = (total_lines) ? vsync_clk_speed_hz / total_lines : 0;