From: Alex Deucher <alexdeucher@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Alex Deucher <alexander.deucher@amd.com>, stable@vger.kernel.org Subject: [PATCH] drm/radeon: properly select encoder in radeon_audio_detect Date: Mon, 18 May 2015 12:24:50 -0400 [thread overview] Message-ID: <1431966291-1449-4-git-send-email-alexander.deucher@amd.com> (raw) In-Reply-To: <1431966291-1449-1-git-send-email-alexander.deucher@amd.com> Need to handle DVI where we way end up with an analog encoder in some cases. Reported-by: Julian Margetson <runaway@candw.ms> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_audio.c | 18 ++++++++++-------- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index dcb7796..31b60f6 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -453,22 +453,24 @@ void radeon_audio_enable(struct radeon_device *rdev, void radeon_audio_detect(struct drm_connector *connector, enum drm_connector_status status) { - struct radeon_device *rdev; - struct radeon_encoder *radeon_encoder; + struct drm_device *dev = connector->dev; + struct radeon_device *rdev = dev->dev_private; struct radeon_encoder_atom_dig *dig; + const struct drm_connector_helper_funcs *connector_funcs = + connector->helper_private; + struct drm_encoder *encoder = connector_funcs->best_encoder(connector); + struct radeon_encoder *radeon_encoder; - if (!connector || !connector->encoder) + if (!connector || !encoder) return; - if (!radeon_encoder_is_digital(connector->encoder)) + if (!radeon_encoder_is_digital(encoder)) return; - rdev = connector->encoder->dev->dev_private; - if (!radeon_audio_chipset_supported(rdev)) return; - radeon_encoder = to_radeon_encoder(connector->encoder); + radeon_encoder = to_radeon_encoder(encoder); dig = radeon_encoder->enc_priv; if (!dig->afmt) @@ -484,7 +486,7 @@ void radeon_audio_detect(struct drm_connector *connector, else radeon_encoder->audio = rdev->audio.hdmi_funcs; - dig->afmt->pin = radeon_audio_get_pin(connector->encoder); + dig->afmt->pin = radeon_audio_get_pin(encoder); if (drm_detect_monitor_audio(radeon_connector_edid(connector))) { radeon_audio_enable(rdev, dig->afmt->pin, 0xf); } else { diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index d17d251..c251eac 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1379,7 +1379,7 @@ out: /* updated in get modes as well since we need to know if it's analog or digital */ radeon_connector_update_scratch_regs(connector, ret); - if (radeon_audio != 0) { + if ((radeon_audio != 0) && (radeon_connector->use_digital)) { radeon_connector_get_edid(connector); radeon_audio_detect(connector, ret); } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Alex Deucher <alexdeucher@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Alex Deucher <alexander.deucher@amd.com>, stable@vger.kernel.org Subject: [PATCH] drm/radeon: properly select encoder in radeon_audio_detect Date: Mon, 18 May 2015 12:24:50 -0400 [thread overview] Message-ID: <1431966291-1449-4-git-send-email-alexander.deucher@amd.com> (raw) In-Reply-To: <1431966291-1449-1-git-send-email-alexander.deucher@amd.com> Need to handle DVI where we way end up with an analog encoder in some cases. Reported-by: Julian Margetson <runaway@candw.ms> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_audio.c | 18 ++++++++++-------- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index dcb7796..31b60f6 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -453,22 +453,24 @@ void radeon_audio_enable(struct radeon_device *rdev, void radeon_audio_detect(struct drm_connector *connector, enum drm_connector_status status) { - struct radeon_device *rdev; - struct radeon_encoder *radeon_encoder; + struct drm_device *dev = connector->dev; + struct radeon_device *rdev = dev->dev_private; struct radeon_encoder_atom_dig *dig; + const struct drm_connector_helper_funcs *connector_funcs = + connector->helper_private; + struct drm_encoder *encoder = connector_funcs->best_encoder(connector); + struct radeon_encoder *radeon_encoder; - if (!connector || !connector->encoder) + if (!connector || !encoder) return; - if (!radeon_encoder_is_digital(connector->encoder)) + if (!radeon_encoder_is_digital(encoder)) return; - rdev = connector->encoder->dev->dev_private; - if (!radeon_audio_chipset_supported(rdev)) return; - radeon_encoder = to_radeon_encoder(connector->encoder); + radeon_encoder = to_radeon_encoder(encoder); dig = radeon_encoder->enc_priv; if (!dig->afmt) @@ -484,7 +486,7 @@ void radeon_audio_detect(struct drm_connector *connector, else radeon_encoder->audio = rdev->audio.hdmi_funcs; - dig->afmt->pin = radeon_audio_get_pin(connector->encoder); + dig->afmt->pin = radeon_audio_get_pin(encoder); if (drm_detect_monitor_audio(radeon_connector_edid(connector))) { radeon_audio_enable(rdev, dig->afmt->pin, 0xf); } else { diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index d17d251..c251eac 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1379,7 +1379,7 @@ out: /* updated in get modes as well since we need to know if it's analog or digital */ radeon_connector_update_scratch_regs(connector, ret); - if (radeon_audio != 0) { + if ((radeon_audio != 0) && (radeon_connector->use_digital)) { radeon_connector_get_edid(connector); radeon_audio_detect(connector, ret); } -- 1.8.3.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-05-18 16:25 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-18 16:24 [PATCH] drm/radeon: make dpcd parameters const Alex Deucher 2015-05-18 16:24 ` [PATCH] drm/radeon: retry dcpd fetch Alex Deucher 2015-05-18 16:24 ` Alex Deucher 2015-05-18 16:24 ` [PATCH] drm/radeon: take the mode_config mutex when dealing with hpds Alex Deucher 2015-05-18 16:24 ` Alex Deucher 2015-05-19 2:27 ` Michel Dänzer 2015-05-19 3:24 ` Dave Airlie 2015-05-19 3:28 ` Alex Deucher 2015-05-19 7:49 ` Daniel Vetter 2015-05-18 16:24 ` Alex Deucher [this message] 2015-05-18 16:24 ` [PATCH] drm/radeon: properly select encoder in radeon_audio_detect Alex Deucher 2015-05-18 16:24 ` [PATCH] drm/radeon: clean up radeon_audio_enable Alex Deucher
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1431966291-1449-4-git-send-email-alexander.deucher@amd.com \ --to=alexdeucher@gmail.com \ --cc=alexander.deucher@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.