Skip to content

Commit

Permalink
drm/i915: Remove vblank wait from hsw_enable_ips, v2.
Browse files Browse the repository at this point in the history
intel_post_plane_update did an extra vblank wait that's no longer needed when enabling ips.

Changes since v1:
- Add comment explaining why vblank wait is performed. (Paulo)

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/56F29B28.5070804@linux.intel.com
  • Loading branch information
Maarten Lankhorst committed Mar 24, 2016
1 parent 321d178 commit 307e449
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -4412,8 +4412,11 @@ void hsw_enable_ips(struct intel_crtc *crtc)
if (!crtc->config->ips_enabled)
return;

/* We can only enable IPS after we enable a plane and wait for a vblank */
intel_wait_for_vblank(dev, crtc->pipe);
/*
* We can only enable IPS after we enable a plane and wait for a vblank
* This function is called from post_plane_update, which is run after
* a vblank wait.
*/

assert_plane_enabled(dev_priv, crtc->plane);
if (IS_BROADWELL(dev)) {
Expand Down

0 comments on commit 307e449

Please sign in to comment.