Commit 342defd8 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/i915: Remove use of runtime pm in atomic commit functions

We needed this originally for updating pagetables in plane commit
functions. But that's extracted into prepare/cleanup now. The other
issue was running updates when the pipe was off. That's also now
fixed.
Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f6ac4b2a
...@@ -13639,14 +13639,11 @@ intel_disable_primary_plane(struct drm_plane *plane, ...@@ -13639,14 +13639,11 @@ intel_disable_primary_plane(struct drm_plane *plane,
static void intel_begin_crtc_commit(struct drm_crtc *crtc) static void intel_begin_crtc_commit(struct drm_crtc *crtc)
{ {
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
if (intel_crtc->atomic.update_wm_pre) if (intel_crtc->atomic.update_wm_pre)
intel_update_watermarks(crtc); intel_update_watermarks(crtc);
intel_runtime_pm_get(dev_priv);
/* Perform vblank evasion around commit operation */ /* Perform vblank evasion around commit operation */
if (crtc->state->active) if (crtc->state->active)
intel_crtc->atomic.evade = intel_crtc->atomic.evade =
...@@ -13659,15 +13656,11 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) ...@@ -13659,15 +13656,11 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc)
static void intel_finish_crtc_commit(struct drm_crtc *crtc) static void intel_finish_crtc_commit(struct drm_crtc *crtc)
{ {
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
if (intel_crtc->atomic.evade) if (intel_crtc->atomic.evade)
intel_pipe_update_end(intel_crtc, intel_pipe_update_end(intel_crtc,
intel_crtc->atomic.start_vbl_count); intel_crtc->atomic.start_vbl_count);
intel_runtime_pm_put(dev_priv);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment