diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-01-23 18:00:06 -0200 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-01-23 18:00:06 -0200 |
| commit | bacd46ab9100c154ccb147ff821d29f45eba1760 (patch) | |
| tree | 7f4ce64721ebb044f1c37478622c5f1c3b911425 | |
| parent | b9bafae2b2c524944c0cd53bc007689896cfa91a (diff) | |
drm/i915: remove useless audio vblank waitresume-optimization-20140123
The pipe is always disabled when we run this code, so we just eat the
50ms timeout. Not good.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e478079ae4b7..a4d66ef0bdfe 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7186,7 +7186,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; @@ -7208,9 +7207,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); |