Attachment 43169 Details for Bug 33760 – Trigger modesetting if force-audio changes

[patch] Trigger modesetting if force-audio changes

0001-drm-i915-Trigger-modesetting-if-force-audio-changes.patch (text/plain), 5.37 KB, created by Chris Wilson on 2011-02-09 10:51:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-02-09 10:51:35 UTC

Size: 5.37 KB

patch

obsolete

>From 464be76bb9f6fc6f1b7f1032d46b216556df5900 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 9 Feb 2011 18:46:58 +0000
>Subject: [PATCH] drm/i915: Trigger modesetting if force-audio changes
>
>If the user changes the force-audio property and it no longer reflects
>the current configuration, then we need to trigger a mode set in order
>to update the registers.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_dp.c   |   36 ++++++++++++++++++++++++++++-----
> drivers/gpu/drm/i915/intel_hdmi.c |   39 +++++++++++++++++++++++++++++++-----
> drivers/gpu/drm/i915/intel_sdvo.c |   34 ++++++++++++++++++++++++++-----
> 3 files changed, 91 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 1f4242b..51cb4e3 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -1639,6 +1639,24 @@ static int intel_dp_get_modes(struct drm_connector *connector)
> 	return 0;
> }
> 
>+static bool
>+intel_dp_detect_audio(struct drm_connector *connector)
>+{
>+	struct intel_dp *intel_dp = intel_attached_dp(connector);
>+	struct edid *edid;
>+	bool has_audio = false;
>+
>+	edid = drm_get_edid(connector, &intel_dp->adapter);
>+	if (edid) {
>+		has_audio = drm_detect_monitor_audio(edid);
>+
>+		connector->display_info.raw_edid = NULL;
>+		kfree(edid);
>+	}
>+
>+	return has_audio;
>+}
>+
> static int
> intel_dp_set_property(struct drm_connector *connector,
> 		      struct drm_property *property,
>@@ -1652,17 +1670,23 @@ intel_dp_set_property(struct drm_connector *connector,
> 		return ret;
> 
> 	if (property == intel_dp->force_audio_property) {
>-		if (val == intel_dp->force_audio)
>+		int i = val;
>+		bool has_audio;
>+
>+		if (i == intel_dp->force_audio)
> 			return 0;
> 
>-		intel_dp->force_audio = val;
>+		intel_dp->force_audio = i;
> 
>-		if (val > 0 && intel_dp->has_audio)
>-			return 0;
>-		if (val < 0 && !intel_dp->has_audio)
>+		if (i == 0)
>+			has_audio = intel_dp_detect_audio(connector);
>+		else
>+			has_audio = i > 0;
>+
>+		if (has_audio == intel_dp->has_audio)
> 			return 0;
> 
>-		intel_dp->has_audio = val > 0;
>+		intel_dp->has_audio = has_audio;
> 		goto done;
> 	}
> 
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>index 0d0273e..c635c9e 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -251,6 +251,27 @@ static int intel_hdmi_get_modes(struct drm_connector *connector)
> 				   &dev_priv->gmbus[intel_hdmi->ddc_bus].adapter);
> }
> 
>+static bool
>+intel_hdmi_detect_audio(struct drm_connector *connector)
>+{
>+	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
>+	struct drm_i915_private *dev_priv = connector->dev->dev_private;
>+	struct edid *edid;
>+	bool has_audio = false;
>+
>+	edid = drm_get_edid(connector,
>+			    &dev_priv->gmbus[intel_hdmi->ddc_bus].adapter);
>+	if (edid) {
>+		if (edid->input & DRM_EDID_INPUT_DIGITAL)
>+			has_audio = drm_detect_monitor_audio(edid);
>+
>+		connector->display_info.raw_edid = NULL;
>+		kfree(edid);
>+	}
>+
>+	return has_audio;
>+}
>+
> static int
> intel_hdmi_set_property(struct drm_connector *connector,
> 		      struct drm_property *property,
>@@ -264,17 +285,23 @@ intel_hdmi_set_property(struct drm_connector *connector,
> 		return ret;
> 
> 	if (property == intel_hdmi->force_audio_property) {
>-		if (val == intel_hdmi->force_audio)
>+		int i = val;
>+		bool has_audio;
>+
>+		if (i == intel_hdmi->force_audio)
> 			return 0;
> 
>-		intel_hdmi->force_audio = val;
>+		intel_hdmi->force_audio = i;
> 
>-		if (val > 0 && intel_hdmi->has_audio)
>-			return 0;
>-		if (val < 0 && !intel_hdmi->has_audio)
>+		if (i == 0)
>+			has_audio = intel_hdmi_detect_audio(connector);
>+		else
>+			has_audio = i > 0;
>+
>+		if (has_audio == intel_hdmi->has_audio)
> 			return 0;
> 
>-		intel_hdmi->has_audio = val > 0;
>+		intel_hdmi->has_audio = has_audio;
> 		goto done;
> 	}
> 
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index 6a09c14..3e09caa 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -1668,6 +1668,22 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
> 	kfree(connector);
> }
> 
>+static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)
>+{
>+	struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
>+	struct edid *edid;
>+	bool has_audio = false;
>+
>+	if (!intel_sdvo->is_hdmi)
>+		return false;
>+
>+	edid = intel_sdvo_get_edid(connector);
>+	if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL)
>+		has_audio = drm_detect_monitor_audio(edid);
>+
>+	return has_audio;
>+}
>+
> static int
> intel_sdvo_set_property(struct drm_connector *connector,
> 			struct drm_property *property,
>@@ -1684,17 +1700,23 @@ intel_sdvo_set_property(struct drm_connector *connector,
> 		return ret;
> 
> 	if (property == intel_sdvo_connector->force_audio_property) {
>-		if (val == intel_sdvo_connector->force_audio)
>+		int i = val;
>+		bool has_audio;
>+
>+		if (i == intel_sdvo_connector->force_audio)
> 			return 0;
> 
>-		intel_sdvo_connector->force_audio = val;
>+		intel_sdvo_connector->force_audio = i;
> 
>-		if (val > 0 && intel_sdvo->has_hdmi_audio)
>-			return 0;
>-		if (val < 0 && !intel_sdvo->has_hdmi_audio)
>+		if (i == 0)
>+			has_audio = intel_sdvo_detect_hdmi_audio(connector);
>+		else
>+			has_audio = i > 0;
>+
>+		if (has_audio == intel_sdvo->has_hdmi_audio)
> 			return 0;
> 
>-		intel_sdvo->has_hdmi_audio = val > 0;
>+		intel_sdvo->has_hdmi_audio = has_audio;
> 		goto done;
> 	}
> 
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33760: 42751 | 42829 | 43133 | 43139 | 43169 | 46301 | 55627 | 55983 | 59356

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.