diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-04-02 19:08:52 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-09 14:47:13 +0200 |
| commit | 4d47dfb8ef95bd13663fe8e93ab6e5d63cc1bb4b (patch) | |
| tree | fe54a9dc901024167a8323893db8b855b98379fa /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/vlv: write the port field in the per-pipe DIP control reg (diff) | |
| download | linux-4d47dfb8ef95bd13663fe8e93ab6e5d63cc1bb4b.tar.xz linux-4d47dfb8ef95bd13663fe8e93ab6e5d63cc1bb4b.zip | |
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 <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |