From: Jesse Barnes Date: Wed, 2 Apr 2014 17:08:52 +0000 (-0700) Subject: drm/i915/vlv: disable AVI infoframe emission when writing infoframes X-Git-Tag: next-20140428~44^2~73 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d47dfb8ef95bd13663fe8e93ab6e5d63cc1bb4b;p=karo-tx-linux.git drm/i915/vlv: disable AVI infoframe emission when writing infoframes We also do a disable later when we write a specific infoframe, but here we do it to prevent sending a stale one before updating the infoframes. Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index ee892a4f9090..3b804fcb1672 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -589,8 +589,8 @@ static void vlv_set_infoframes(struct drm_encoder *encoder, } val |= VIDEO_DIP_ENABLE; - val &= ~(VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT | - VIDEO_DIP_ENABLE_GCP); + val &= ~(VIDEO_DIP_ENABLE_AVI | VIDEO_DIP_ENABLE_VENDOR | + VIDEO_DIP_ENABLE_GAMUT | VIDEO_DIP_ENABLE_GCP); I915_WRITE(reg, val); POSTING_READ(reg);