Commit b77d0f0d authored by Sean Paul's avatar Sean Paul Committed by Rob Clark
Browse files

drm/msm: dpu: Move pm_runtime_(get|put) from vblank_enable



There are 4 times that _dpu_crtc_vblank_enable_no_lock() is called:

1- crtc enable
2- crtc disable
3- crtc vblank enable
4- crtc vblank disable

When we enable or disable the crtc, we call drm_crtc_vblank_on and
drm_crtc_vblank_off respectively. That will gate vblank enables and
disables to only being called when the crtc is active. That means that
we can just enable/disable pm runtime in crtc enable/disable. This will
be beneficial in trying to eliminate blocking calls from the vblank call
chain.

Changes in v2:
- None

Reviewed-by: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 1dfdb0e1
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -784,8 +784,6 @@ static void _dpu_crtc_vblank_enable_no_lock(
	struct drm_encoder *enc;

	if (enable) {
		pm_runtime_get_sync(dev->dev);

		list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
			if (enc->crtc != crtc)
				continue;
@@ -808,8 +806,6 @@ static void _dpu_crtc_vblank_enable_no_lock(

			dpu_encoder_register_vblank_callback(enc, NULL, NULL);
		}

		pm_runtime_put_sync(dev->dev);
	}
}

@@ -918,6 +914,8 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
		crtc->state->event = NULL;
		spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
	}

	pm_runtime_put_sync(crtc->dev->dev);
}

static void dpu_crtc_enable(struct drm_crtc *crtc,
@@ -933,6 +931,8 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
	}
	priv = crtc->dev->dev_private;

	pm_runtime_get_sync(crtc->dev->dev);

	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
	dpu_crtc = to_dpu_crtc(crtc);