diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2016-01-19 11:35:51 -0200 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2016-01-29 18:17:19 -0200 |
| commit | 58f9c0bc557588fbe3f54c521dd8c6f20598e64e (patch) | |
| tree | 1e59ecfeeb224ef814a9a0a2f666459ae9379026 /drivers/gpu/drm/i915/intel_fbc.c | |
| parent | f51be2e0e3c54b7146152b39c1b5f569a005ab79 (diff) | |
| download | op-kernel-dev-58f9c0bc557588fbe3f54c521dd8c6f20598e64e.zip op-kernel-dev-58f9c0bc557588fbe3f54c521dd8c6f20598e64e.tar.gz | |
drm/i915/fbc: move intel_fbc_{enable, disable} call one level up
Instead of duplicating the calls for every platform, let's just put
them in the correct places inside intel_atomic_commit. This will also
make it easier for us to move the enable call in order to support
fasbtoot.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-19-git-send-email-paulo.r.zanoni@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 5bf7f84..60644dd 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -1137,7 +1137,7 @@ static void __intel_fbc_disable(struct drm_i915_private *dev_priv) WARN_ON(!mutex_is_locked(&fbc->lock)); WARN_ON(!fbc->enabled); WARN_ON(fbc->active); - assert_pipe_disabled(dev_priv, crtc->pipe); + WARN_ON(crtc->active); DRM_DEBUG_KMS("Disabling FBC on pipe %c\n", pipe_name(crtc->pipe)); |
