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

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

Merge "drm/msm/sde: remove extra read of vbif halt ack register"

parents d31d979c 89e6f2fc

drivers/gpu/drm/msm/sde/sde_vbif.c

+1 −10
Original line number Diff line number Diff line
@@ -102,15 +102,6 @@ int sde_vbif_halt_plane_xin(struct sde_kms *sde_kms, u32 xin_id, u32 clk_ctrl) 
		"wait failed for pipe halt:xin_id %u, clk_ctrl %u, rc %u\n",

			xin_id, clk_ctrl, rc);

		SDE_EVT32(xin_id, clk_ctrl, rc, SDE_EVTLOG_ERROR);

		return rc;

	}



	status = vbif->ops.get_halt_ctrl(vbif, xin_id);

	if (status == 0) {

		SDE_ERROR("halt failed for pipe xin_id %u halt clk_ctrl %u\n",

			       xin_id, clk_ctrl);

		SDE_EVT32(xin_id, clk_ctrl, SDE_EVTLOG_ERROR);

		return -ETIMEDOUT;

	}



	/* open xin client to enable transactions */
@@ -118,7 +109,7 @@ int sde_vbif_halt_plane_xin(struct sde_kms *sde_kms, u32 xin_id, u32 clk_ctrl) 
	if (forced_on)

		mdp->ops.setup_clk_force_ctrl(mdp, clk_ctrl, false);



	return 0;

	return rc;

}



/**