Attachment 82200 Details for Bug 66714 – possible fix

[patch] possible fix

0001-drm-radeon-hdmi-make-sure-we-have-an-afmt-block-assi.patch (text/plain), 2.22 KB, created by Alex Deucher on 2013-07-08 22:19:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-07-08 22:19:28 UTC

Size: 2.22 KB

patch

obsolete

>From 131ec1e1c93c0b8917e5eefc053e87f5f7e6dcd7 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 8 Jul 2013 18:16:56 -0400
>Subject: [PATCH] drm/radeon/hdmi: make sure we have an afmt block assigned
>
>Prevents a segfault if an afmt block is not assigned to the
>encoder.
>
>Should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=66714
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/evergreen_hdmi.c |    6 ++++++
> drivers/gpu/drm/radeon/r600_hdmi.c      |    6 ++++++
> 2 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>index b9c6f76..b0d3fb3 100644
>--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
>+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>@@ -177,6 +177,9 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
> 	uint32_t offset;
> 	ssize_t err;
> 
>+	if (!dig || !dig->afmt)
>+		return;
>+
> 	/* Silent, r600_hdmi_enable will raise WARN for us */
> 	if (!dig->afmt->enabled)
> 		return;
>@@ -280,6 +283,9 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable)
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
> 
>+	if (!dig || !dig->afmt)
>+		return;
>+
> 	/* Silent, r600_hdmi_enable will raise WARN for us */
> 	if (enable && dig->afmt->enabled)
> 		return;
>diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
>index e73b2a7..f48240b 100644
>--- a/drivers/gpu/drm/radeon/r600_hdmi.c
>+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
>@@ -266,6 +266,9 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
> 	uint32_t offset;
> 	ssize_t err;
> 
>+	if (!dig || !dig->afmt)
>+		return;
>+
> 	/* Silent, r600_hdmi_enable will raise WARN for us */
> 	if (!dig->afmt->enabled)
> 		return;
>@@ -448,6 +451,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder, bool enable)
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
> 	u32 hdmi = HDMI0_ERROR_ACK;
> 
>+	if (!dig || !dig->afmt)
>+		return;
>+
> 	/* Silent, r600_hdmi_enable will raise WARN for us */
> 	if (enable && dig->afmt->enabled)
> 		return;
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 66714: 82200 | 82202

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.