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

Commit 9a9ede3f authored by Bruce Wang's avatar Bruce Wang Committed by Rob Clark
Browse files

drm/msm/dpu: Remove _dpu_crtc_power_enable 



All checks for _dpu_crtc_power_enable are not true, so the function
can never return an error code. This removes the need for the
function as pm_runtime functions can be used instead.

v3: Separated _dpu_crtc_power_enable into _dpu_crtc_power_enable and
_dpu_crtc_power_disable for clarity.

v4: Removed both _dpu_crtc_power_enable and _dpu_crtc_power_disable
and called pm_runtime_get_sync and pm_runtime_put_sync from all
call points

Reviewed-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarBruce Wang <bzwang@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 04b96b63

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+2 −39
Original line number Diff line number Diff line
@@ -60,39 +60,6 @@ static inline struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc) 
	return to_dpu_kms(priv->kms);

}



static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool enable)

{

	struct drm_crtc *crtc;

	struct msm_drm_private *priv;

	struct dpu_kms *dpu_kms;



	if (!dpu_crtc) {

		DPU_ERROR("invalid dpu crtc\n");

		return -EINVAL;

	}



	crtc = &dpu_crtc->base;

	if (!crtc->dev || !crtc->dev->dev_private) {

		DPU_ERROR("invalid drm device\n");

		return -EINVAL;

	}



	priv = crtc->dev->dev_private;

	if (!priv->kms) {

		DPU_ERROR("invalid kms\n");

		return -EINVAL;

	}



	dpu_kms = to_dpu_kms(priv->kms);



	if (enable)

		pm_runtime_get_sync(&dpu_kms->pdev->dev);

	else

		pm_runtime_put_sync(&dpu_kms->pdev->dev);



	return 0;

}



static void dpu_crtc_destroy(struct drm_crtc *crtc)

{

	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
@@ -823,14 +790,10 @@ static int _dpu_crtc_vblank_enable_no_lock( 
	dev = crtc->dev;



	if (enable) {

		int ret;



		/* drop lock since power crtc cb may try to re-acquire lock */

		mutex_unlock(&dpu_crtc->crtc_lock);

		ret = _dpu_crtc_power_enable(dpu_crtc, true);

		pm_runtime_get_sync(dev->dev);

		mutex_lock(&dpu_crtc->crtc_lock);

		if (ret)

			return ret;



		list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {

			if (enc->crtc != crtc)
@@ -857,7 +820,7 @@ static int _dpu_crtc_vblank_enable_no_lock( 


		/* drop lock since power crtc cb may try to re-acquire lock */

		mutex_unlock(&dpu_crtc->crtc_lock);

		_dpu_crtc_power_enable(dpu_crtc, false);

		pm_runtime_put_sync(dev->dev);

		mutex_lock(&dpu_crtc->crtc_lock);

	}