diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-06-01 12:49:55 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-06-12 13:19:32 +0300 |
| commit | 8a8f7f44a1b704c482f77a0d31cbcdf1af062263 (patch) | |
| tree | 3083d4b5002e7b2c095b14b57a221e3dac556986 /drivers/gpu/drm | |
| parent | 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d (diff) | |
drm/i915: do not wait for vblank when crtc is off
This can happen when turning off a sprite plane. Because the crtc state
is not yet always swapped correctly and transitional helpers are used
the crtc state cannot be relied on.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 91a0f7ca7ed2..e0edff9d034d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13768,7 +13768,7 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc) intel_runtime_pm_put(dev_priv); - if (intel_crtc->atomic.wait_vblank) + if (intel_crtc->atomic.wait_vblank && intel_crtc->active) intel_wait_for_vblank(dev, intel_crtc->pipe); intel_frontbuffer_flip(dev, intel_crtc->atomic.fb_bits); |