intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Refine the has_audio assignment
@ 2018-04-13  4:06 Yang
  2018-04-13  4:30 ` ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Yang @ 2018-04-13  4:06 UTC (permalink / raw)
  To: intel-gfx; +Cc: Yang Shi

From: Yang Shi <yang.a.shi@intel.com>

Refine the has_audio assignment for dp and hdmi.

Signed-off-by: Yang Shi <yang.a.shi@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c   | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a29868c..47aa2ea 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1644,7 +1644,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
 		pipe_config->has_audio = intel_dp->has_audio;
 	else
-		pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
+		pipe_config->has_audio = false;
 
 	if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
 		struct drm_display_mode *panel_mode =
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 179d0ad..3c4b92e 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1474,8 +1474,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
 		if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
 			pipe_config->has_audio = intel_hdmi->has_audio;
 		else
-			pipe_config->has_audio =
-				intel_conn_state->force_audio == HDMI_AUDIO_ON;
+			pipe_config->has_audio = false;
 	}
 
 	/*
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-04-19  6:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-13  4:06 [PATCH] drm/i915: Refine the has_audio assignment Yang
2018-04-13  4:30 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-04-13  5:17 ` ✓ Fi.CI.IGT: " Patchwork
2018-04-13  9:50 ` [PATCH] " Chris Wilson
2018-04-18 12:44   ` Jani Nikula
2018-04-19  1:22     ` Shi, Yang A
2018-04-19  6:12       ` Chris Wilson
2018-04-19  6:27         ` Shi, Yang A

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).