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

Commit 7b34682e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: Fix null dereference errors"

parents 3c7ee584 792d3d43

msm/sde/sde_core_perf.c

+6 −3
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ static void _sde_core_perf_calc_doze_suspend(struct drm_crtc *crtc, 
{

	struct sde_crtc_state *new_cstate, *old_cstate;

	struct sde_core_perf_params *old_perf;

	struct drm_connector *conn;

	struct sde_connector *c_conn;

	struct drm_connector *conn = NULL;

	struct sde_connector *c_conn = NULL;

	bool is_doze_suspend = false;

	int i;
@@ -130,7 +130,7 @@ static void _sde_core_perf_calc_doze_suspend(struct drm_crtc *crtc, 
				is_doze_suspend = true;

		}



		if (!is_doze_suspend) {

		if (!is_doze_suspend && conn && c_conn) {

			SDE_DEBUG("No BW, planes:%x dpms_mode:%d lpmode:%d\n",

				state->plane_mask, c_conn->dpms_mode,

				sde_connector_get_lp(conn));
@@ -817,6 +817,9 @@ static void _sde_core_perf_crtc_update_check(struct drm_crtc *crtc, 
	struct sde_core_perf_params *new = &sde_crtc->new_perf;

	int i;



	if (!kms)

		return;



	/*

	 * cases for the llcc update.

	 * 1. llcc is transitioning: 'inactive->active' during kickoff,

msm/sde/sde_encoder_phys_cmd.c

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void _sde_encoder_phys_cmd_setup_irq_hw_idx( 
		struct sde_encoder_phys *phys_enc)

{

	struct sde_encoder_irq *irq;

	struct sde_kms *sde_kms = phys_enc->sde_kms;

	struct sde_kms *sde_kms;

	int ret = 0;



	if (!phys_enc || !phys_enc->hw_pp || !phys_enc->hw_ctl) {
@@ -337,6 +337,7 @@ static void _sde_encoder_phys_cmd_setup_irq_hw_idx( 
		return;

	}



	sde_kms = phys_enc->sde_kms;

	mutex_lock(&sde_kms->vblank_ctl_global_lock);



	if (atomic_read(&phys_enc->vblank_refcount)) {

msm/sde/sde_rm.c

+1 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ int sde_rm_reserve( 
	 * comes again after earlier commit gets processed.

	 */



	if (test_only && rsvp_nxt) {

	if (test_only && rsvp_cur && rsvp_nxt) {

		SDE_ERROR("cur %d nxt %d enc %d conn %d\n", rsvp_cur->seq,

			 rsvp_nxt->seq, enc->base.id,

			 conn_state->connector->base.id);