summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2017-11-29 18:43:01 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2017-12-01 17:04:19 +0200
commit20ff39fa4312dfaee8d1314a208e6a5a3ee51cbc (patch)
tree977d88e7965fbaa8be1f65d0bbd7bd48cf54e536 /drivers/gpu/drm/i915/intel_dp.c
parentb37aef5f1b5a4788eca662de6cb33e1521a7e404 (diff)
downloadop-kernel-dev-20ff39fa4312dfaee8d1314a208e6a5a3ee51cbc.zip
op-kernel-dev-20ff39fa4312dfaee8d1314a208e6a5a3ee51cbc.tar.gz
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-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 c603d4c..01c848b 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,
pipe_config->has_pch_encoder = true;
pipe_config->has_drrs = false;
- if (port == PORT_A)
+ if (IS_G4X(dev_priv) || port == PORT_A)
pipe_config->has_audio = false;
else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
pipe_config->has_audio = intel_dp->has_audio;
OpenPOWER on IntegriCloud