aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2017-11-29 11:43:01 -0500
committerVille Syrjälä <ville.syrjala@linux.intel.com>2017-12-01 10:04:19 -0500
commit20ff39fa4312dfaee8d1314a208e6a5a3ee51cbc (patch)
tree977d88e7965fbaa8be1f65d0bbd7bd48cf54e536
parentb37aef5f1b5a4788eca662de6cb33e1521a7e404 (diff)
drm/i915: Disable DP audio for g4x
Apparently g4x doesn't support audio over DP. Bspec lists the bit as "Reserved for Audio Output Enable", and empirical evidence tells us that the bit won't stick. So stop trying to enable DP audio on g4x. Link: https://patchwork.freedesktop.org/patch/msgid/20171129164303.18793-1-ville.syrjala@linux.intel.com Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103989 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index c603d4c903e1..01c848bbd795 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1643,7 +1643,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
1643 pipe_config->has_pch_encoder = true; 1643 pipe_config->has_pch_encoder = true;
1644 1644
1645 pipe_config->has_drrs = false; 1645 pipe_config->has_drrs = false;
1646 if (port == PORT_A) 1646 if (IS_G4X(dev_priv) || port == PORT_A)
1647 pipe_config->has_audio = false; 1647 pipe_config->has_audio = false;
1648 else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO) 1648 else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
1649 pipe_config->has_audio = intel_dp->has_audio; 1649 pipe_config->has_audio = intel_dp->has_audio;