Attachment 114978 Details for Bug 89958 – drm/i915/dp: do not touch audio on port a

[patch] drm/i915/dp: do not touch audio on port a

0001-drm-i915-dp-do-not-touch-audio-on-port-a.patch (text/plain), 1.40 KB, created by Jani Nikula on 2015-04-09 09:48:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jani Nikula

Created: 2015-04-09 09:48:39 UTC

Size: 1.40 KB

patch

obsolete

>From 5251496b808a35d4e1c02376b6998ac2a37ed71a Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Thu, 9 Apr 2015 12:41:53 +0300
>Subject: [PATCH] drm/i915/dp: do not touch audio on port a
>Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
>Cc: Jani Nikula <jani.nikula@intel.com>
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/i915/intel_dp.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 1b87969536ff..771fd1aae236 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -1346,7 +1346,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> 
> 	pipe_config->has_dp_encoder = true;
> 	pipe_config->has_drrs = false;
>-	pipe_config->has_audio = intel_dp->has_audio;
>+	if (!HAS_PCH_SPLIT(dev) || HAS_DDI(dev) || port != PORT_A)
>+		pipe_config->has_audio = intel_dp->has_audio;
> 
> 	if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
> 		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
>@@ -2209,7 +2210,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
> 	int dotclock;
> 
> 	tmp = I915_READ(intel_dp->output_reg);
>-	if (tmp & DP_AUDIO_OUTPUT_ENABLE)
>+	if (port != PORT_A && tmp & DP_AUDIO_OUTPUT_ENABLE)
> 		pipe_config->has_audio = true;
> 
> 	if ((port == PORT_A) || !HAS_PCH_CPT(dev)) {
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89958: 114967 | 114978

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.