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

Commit a2aa60c2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: dp: fix no display issue on second connection"

parents b85e2384 525ccbac

drivers/platform/msm/msm_ext_display.c

+5 −3
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ static int msm_ext_disp_process_display(struct msm_ext_disp *ext_disp, 
		goto end;

	}



	if (state == EXT_DISPLAY_CABLE_CONNECT)

		ext_disp->current_disp = type;

	else

		ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;



	ret = msm_ext_disp_send_cable_notification(ext_disp, state);



	/* positive ret value means audio node was switched */
@@ -287,7 +292,6 @@ static bool msm_ext_disp_validate_connect(struct msm_ext_disp *ext_disp, 
	if (ext_disp->current_disp != type)

		return false;

end:

	ext_disp->current_disp = type;

	return true;

}
@@ -369,8 +373,6 @@ static int msm_ext_disp_hpd(struct platform_device *pdev, 
		msm_ext_disp_process_audio(ext_disp, type, state, flags);

		msm_ext_disp_update_audio_ops(ext_disp, type, state, flags);

		msm_ext_disp_process_display(ext_disp, type, state, flags);



		ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;

	}



	pr_debug("Hpd (%d) for display (%s)\n", state,