diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-03-23 09:33:28 -0400 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-03-24 06:24:58 -0400 |
| commit | 307e44988018943586f27d554a1773f685b3342e (patch) | |
| tree | f93aad85ffbd85b964cbf064e77b9959b7662c44 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 321d178edb17d4619dbfa6216ac185c30c18d31a (diff) | |
drm/i915: Remove vblank wait from hsw_enable_ips, v2.
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 009b03b09a40..7c4ffcaf13c1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -4412,8 +4412,11 @@ void hsw_enable_ips(struct intel_crtc *crtc) | |||
| 4412 | if (!crtc->config->ips_enabled) | 4412 | if (!crtc->config->ips_enabled) |
| 4413 | return; | 4413 | return; |
| 4414 | 4414 | ||
| 4415 | /* We can only enable IPS after we enable a plane and wait for a vblank */ | 4415 | /* |
| 4416 | intel_wait_for_vblank(dev, crtc->pipe); | 4416 | * We can only enable IPS after we enable a plane and wait for a vblank |
| 4417 | * This function is called from post_plane_update, which is run after | ||
| 4418 | * a vblank wait. | ||
| 4419 | */ | ||
| 4417 | 4420 | ||
| 4418 | assert_plane_enabled(dev_priv, crtc->plane); | 4421 | assert_plane_enabled(dev_priv, crtc->plane); |
| 4419 | if (IS_BROADWELL(dev)) { | 4422 | if (IS_BROADWELL(dev)) { |