OSDN Git Service

drm/i915: Disable DP audio for g4x
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 29 Nov 2017 16:43:01 +0000 (18:43 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 1 Dec 2017 15:04:19 +0000 (17:04 +0200)
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>
drivers/gpu/drm/i915/intel_dp.c

index c603d4c..01c848b 100644 (file)
@@ -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;