From: Maarten Lankhorst Date: Wed, 23 Mar 2016 13:33:28 +0000 (+0100) Subject: drm/i915: Remove vblank wait from hsw_enable_ips, v2. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=307e44988018943586f27d554a1773f685b3342e;p=openwrt%2Fstaging%2Fblogic.git 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 Reviewed-by: Paulo Zanoni Link: http://patchwork.freedesktop.org/patch/msgid/56F29B28.5070804@linux.intel.com --- 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) 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)) {