From ad2c413a64289d91f1727bef1ed37703d5225efa Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Nov 27 2014 18:44:41 +0000 Subject: Add patch to fix radeon HDMI issues (rhbz 1167511) --- diff --git a/drm-radeon-initialize-sadb-to-NULL-in-the-audio-code.patch b/drm-radeon-initialize-sadb-to-NULL-in-the-audio-code.patch new file mode 100644 index 0000000..034072a --- /dev/null +++ b/drm-radeon-initialize-sadb-to-NULL-in-the-audio-code.patch @@ -0,0 +1,56 @@ +From 83d04c39f9048807a8500e575ae3f1718a3f45bb Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Mon, 13 Oct 2014 13:23:48 -0400 +Subject: [PATCH] drm/radeon: initialize sadb to NULL in the audio code + +Fixes kfree of the sadb buffer when it's NULL. + +Signed-off-by: Alex Deucher +--- + drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c +index 950af153f30e..6b1dbecdd36d 100644 +--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c ++++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c +@@ -32,7 +32,7 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) + struct drm_connector *connector; + struct radeon_connector *radeon_connector = NULL; + u32 tmp; +- u8 *sadb; ++ u8 *sadb = NULL; + int sad_count; + + list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { +diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c +index c0bbf68dbc27..960a5f0f042f 100644 +--- a/drivers/gpu/drm/radeon/dce6_afmt.c ++++ b/drivers/gpu/drm/radeon/dce6_afmt.c +@@ -155,7 +155,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) + struct drm_connector *connector; + struct radeon_connector *radeon_connector = NULL; + u32 offset, tmp; +- u8 *sadb; ++ u8 *sadb = NULL; + int sad_count; + + if (!dig || !dig->afmt || !dig->afmt->pin) +diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c +index 2514d659b1ba..f6a5c3026f85 100644 +--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c ++++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c +@@ -133,7 +133,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) + struct drm_connector *connector; + struct radeon_connector *radeon_connector = NULL; + u32 tmp; +- u8 *sadb; ++ u8 *sadb = NULL; + int sad_count; + + list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { +-- +1.9.3 + diff --git a/kernel.spec b/kernel.spec index 471f0aa..b2c1716 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 300 +%global baserelease 301 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -621,6 +621,9 @@ Patch26090: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch #rhbz 1165206 Patch26071: usb-quirks-Add-reset-resume-quirk-for-MS-Wireless-La.patch +#rhbz 1167511 +Patch26072: drm-radeon-initialize-sadb-to-NULL-in-the-audio-code.patch + # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch @@ -1355,6 +1358,9 @@ ApplyPatch HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch #rhbz 1165206 ApplyPatch usb-quirks-Add-reset-resume-quirk-for-MS-Wireless-La.patch +#rhbz 1167511 +ApplyPatch drm-radeon-initialize-sadb-to-NULL-in-the-audio-code.patch + %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2223,6 +2229,9 @@ fi # ||----w | # || || %changelog +* Thu Nov 27 2014 Josh Boyer - 3.17.4-301 +- Add patch to fix radeon HDMI issues (rhbz 1167511) + * Mon Nov 24 2014 Josh Boyer - Add quirk for Laser Mouse 6000 (rhbz 1165206)