Skip to content

Commit

Permalink
drm/i915: do not wait for vblank when crtc is off
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maarten Lankhorst authored and Jani Nikula committed Jun 12, 2015
1 parent 36750f2 commit 8a8f7f4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8a8f7f4

Please sign in to comment.