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

Commit 1dc48c24 authored by Alisha Thapaliya's avatar Alisha Thapaliya
Browse files

Merge remote-tracking branch 'quic/display-kernel.lnx.4.19' into display-kernel.lnx.1.0 



* quic/display-kernel.lnx.4.19:
  disp: add rev checks for bengal target
  disp: msm: sde: null check for kms device
  disp: msm: sde: log bw info in event logs
  disp: msm: sde: fix uidle trace format configuration
  disp: msm: sde: handle another case for lost pp-done interrupt
  disp: msm: sde: fix video mode prefill lines for RSCC
  disp: msm: sde: Use platform independent API for 64-bit div
  disp: msm: dsi: check bit clock before bypassing clock set during DMS
  Revert "disp: msm: sde: update splash resource allocation for dual display"
  disp: msm: sde: update clk rate for perf mode
  disp: msm: sde: check all dirty properties during plane update
  disp: msm: dp: perform host_init/deinit to reset abort
  disp: msm: dp: skip wait if audio engine is disabled
  disp: msm: add check for buffer length before copy

Change-Id: Ib04e4d9f8aea724b289164ab6161f60130a33669
Signed-off-by: default avatarAlisha Thapaliya <athapali@codeaurora.org>
parents 2ee7f385 62c99029

msm/dp/dp_audio.c

+8 −2
Original line number Diff line number Diff line
@@ -414,6 +414,9 @@ static int dp_audio_info_setup(struct platform_device *pdev, 
	dp_audio_enable(audio, true);



	mutex_unlock(&audio->ops_lock);



	DP_DEBUG("audio stream configured\n");



	return rc;

}
@@ -671,6 +674,9 @@ static int dp_audio_notify(struct dp_audio_private *audio, u32 state) 
	if (atomic_read(&audio->acked))

		goto end;



	if (state == EXT_DISPLAY_CABLE_DISCONNECT && !audio->engine_on)

		goto end;



	if (state == EXT_DISPLAY_CABLE_CONNECT)

		goto end;

msm/dp/dp_ctrl.c

+5 −2
Original line number Diff line number Diff line
@@ -1280,11 +1280,14 @@ static int dp_ctrl_on(struct dp_ctrl *dp_ctrl, bool mst_mode, 


	ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);



	atomic_set(&ctrl->aborted, 0);



	if (ctrl->power_on)

		goto end;



	if (atomic_read(&ctrl->aborted)) {

		rc = -EPERM;

		goto end;

	}



	ctrl->mst_mode = mst_mode;

	if (fec_mode) {

		ctrl->fec_mode = fec_mode;

msm/dp/dp_display.c

+2 −5
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) 


	dp->dp_display.max_pclk_khz = min(dp->parser->max_pclk_khz,

					dp->debug->max_pclk_khz);



	dp_display_host_init(dp);

	dp_display_host_ready(dp);



	dp->link->psm_config(dp->link, &dp->panel->link_info, false);
@@ -1084,6 +1084,7 @@ static int dp_display_handle_disconnect(struct dp_display_private *dp) 
		dp_display_clean(dp);



	dp_display_host_unready(dp);

	dp_display_host_deinit(dp);



	mutex_unlock(&dp->session_lock);
@@ -1131,10 +1132,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) 


	dp_display_disconnect_sync(dp);



	mutex_lock(&dp->session_lock);

	dp_display_host_deinit(dp);

	mutex_unlock(&dp->session_lock);



	if (!dp->debug->sim_mode && !dp->parser->no_aux_switch

	    && !dp->parser->gpio_aux_switch)

		dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE);

msm/dsi/dsi_ctrl.c

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ static ssize_t debugfs_state_info_read(struct file *file, 
			dsi_ctrl->clk_freq.pix_clk_rate,

			dsi_ctrl->clk_freq.esc_clk_rate);



	if (len > count)

		len = count;



	len = min_t(size_t, len, SZ_4K);

	if (copy_to_user(buff, buf, len)) {

		kfree(buf);
@@ -171,6 +174,8 @@ static ssize_t debugfs_reg_dump_read(struct file *file, 
		return rc;

	}



	if (len > count)

		len = count;



	len = min_t(size_t, len, SZ_4K);

	if (copy_to_user(buff, buf, len)) {

msm/dsi/dsi_display.c

+1 −1
Original line number Diff line number Diff line
@@ -4520,7 +4520,7 @@ static int dsi_display_set_mode_sub(struct dsi_display *display, 
		commit_phy_timing = true;



		/* No need to set clkrate pending flag if clocks are same */

		if (cur_bitclk != to_bitclk)

		if ((!cur_bitclk && !to_bitclk) || (cur_bitclk != to_bitclk))

			atomic_set(&display->clkrate_change_pending, 1);



		dsi_display_validate_dms_fps(display->panel->cur_mode, mode);