diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-05-27 18:58:02 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-06-12 15:52:50 -0400 |
commit | fd93a252da41e40e2b6383122eb6009714faa51c (patch) | |
tree | 3e1451ccab8482269f63ababcf0d9f0cdb982b7f | |
parent | 1cfe19aa611b332e182cd9976e91a205121ac956 (diff) |
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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 4 |
1 files changed, 0 insertions, 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) | |||
374 | 374 | ||
375 | DBG("%s: enable=%d", omap_crtc->name, enable); | 375 | DBG("%s: enable=%d", omap_crtc->name, enable); |
376 | 376 | ||
377 | dispc_runtime_get(); | ||
378 | |||
379 | for (i = 0; i < priv->num_encoders; i++) { | 377 | for (i = 0; i < priv->num_encoders; i++) { |
380 | if (priv->encoders[i]->crtc == crtc) { | 378 | if (priv->encoders[i]->crtc == crtc) { |
381 | encoder = priv->encoders[i]; | 379 | encoder = priv->encoders[i]; |
@@ -396,8 +394,6 @@ static void omap_crtc_encoder_setup(struct drm_crtc *crtc, bool enable) | |||
396 | omap_encoder_set_enabled(encoder, true); | 394 | omap_encoder_set_enabled(encoder, true); |
397 | } | 395 | } |
398 | } | 396 | } |
399 | |||
400 | dispc_runtime_put(); | ||
401 | } | 397 | } |
402 | 398 | ||
403 | /* ----------------------------------------------------------------------------- | 399 | /* ----------------------------------------------------------------------------- |