From fd93a252da41e40e2b6383122eb6009714faa51c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 28 May 2015 01:58:02 +0300 Subject: [PATCH] drm: omapdrm: Remove nested PM get/sync when configuring encoders The omap_crtc_encoder_setup() function is always called with the DSS enabled. Remove the dispc_runtime_get() and dispc_runtime_put() calls. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index aa719ebfe787..16f9c07dc4f6 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -374,8 +374,6 @@ static void omap_crtc_encoder_setup(struct drm_crtc *crtc, bool enable) DBG("%s: enable=%d", omap_crtc->name, enable); - dispc_runtime_get(); - for (i = 0; i < priv->num_encoders; i++) { if (priv->encoders[i]->crtc == crtc) { encoder = priv->encoders[i]; @@ -396,8 +394,6 @@ static void omap_crtc_encoder_setup(struct drm_crtc *crtc, bool enable) omap_encoder_set_enabled(encoder, true); } } - - dispc_runtime_put(); } /* -----------------------------------------------------------------------------