From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 4/4] drm/i915: skip useless vblank wait on Haswell audio sequence Date: Fri, 20 Sep 2013 16:22:41 -0300 Message-ID: <1379704961-1698-1-git-send-email-przanoni@gmail.com> References: <20130920081733.GJ32145@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-yh0-f44.google.com (mail-yh0-f44.google.com [209.85.213.44]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C54BE5C35 for ; Fri, 20 Sep 2013 12:22:53 -0700 (PDT) Received: by mail-yh0-f44.google.com with SMTP id f64so349508yha.3 for ; Fri, 20 Sep 2013 12:22:51 -0700 (PDT) In-Reply-To: <20130920081733.GJ32145@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni , Wang Xingchao List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni We call haswell_write_eld at mode_set time, not at crtc_enable time, so the pipes are stopped, and it doesn't really make sense to wait for a vblank: it just delays the modeset in 50ms. v2: - Remove the big comment - CC Audio developers Cc: Wang Xingchao Cc: Mengdong Lin Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 61621ce..e79dd45 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6663,7 +6663,6 @@ static void haswell_write_eld(struct drm_connector *connector, { struct drm_i915_private *dev_priv = connector->dev->dev_private; uint8_t *eld = connector->eld; - struct drm_device *dev = crtc->dev; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); uint32_t eldv; uint32_t i; @@ -6685,9 +6684,6 @@ static void haswell_write_eld(struct drm_connector *connector, tmp |= (AUDIO_OUTPUT_ENABLE_A << (pipe * 4)); I915_WRITE(aud_cntrl_st2, tmp); - /* Wait for 1 vertical blank */ - intel_wait_for_vblank(dev, pipe); - /* Set ELD valid state */ tmp = I915_READ(aud_cntrl_st2); DRM_DEBUG_DRIVER("HDMI audio: pin eld vld status=0x%08x\n", tmp); -- 1.8.3.1