From: Laurent Pinchart Date: Wed, 27 May 2015 22:58:02 +0000 (+0300) Subject: drm: omapdrm: Remove nested PM get/sync when configuring encoders X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd93a252da41e40e2b6383122eb6009714faa51c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- 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(); } /* -----------------------------------------------------------------------------