diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-03-14 15:16:18 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-03-16 11:51:25 -0700 |
| commit | f4911856264809ea51484f98854e4c1aeff078d4 (patch) | |
| tree | 0cc1b1893a116c04ae9a00ad2d0c955760a9986e | |
| parent | 3faba8457b1e3af31133c9127435ad52d6d47bd1 (diff) | |
| download | kernel-f4911856264809ea51484f98854e4c1aeff078d4.tar.gz kernel-f4911856264809ea51484f98854e4c1aeff078d4.tar.xz kernel-f4911856264809ea51484f98854e4c1aeff078d4.zip | |
Revert patch causing radeon breakage (rhbz 1317300 1317179)
| -rw-r--r-- | 0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch | 25 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 32 insertions, 0 deletions
diff --git a/0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch b/0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch new file mode 100644 index 000000000..3c4a5b6b8 --- /dev/null +++ b/0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch @@ -0,0 +1,25 @@ +From b461a1b881b40fa9b75b9b8f54d6f9fefc2f2fef Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@fedoraproject.org> +Date: Tue, 15 Mar 2016 11:34:47 -0700 +Subject: [PATCH] Revert "drm/radeon: call hpd_irq_event on resume" + +This reverts commit b36e52c44ce6728824546d8b5f05b844cede96f1. +--- + drivers/gpu/drm/radeon/radeon_device.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c +index d690df5..c566993 100644 +--- a/drivers/gpu/drm/radeon/radeon_device.c ++++ b/drivers/gpu/drm/radeon/radeon_device.c +@@ -1744,7 +1744,6 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) + } + + drm_kms_helper_poll_enable(dev); +- drm_helper_hpd_irq_event(dev); + + /* set the power state here in case we are a PX system or headless */ + if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled) +-- +2.5.0 + diff --git a/kernel.spec b/kernel.spec index 57a08bc74..98d7a93a0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -643,6 +643,8 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #CVE-2016-3135 rhbz 1318172 1318270 Patch666: ipv4-Dont-do-expensive-useless-work-during-inetdev-des.patch +#rhbz 1317300 1317179 +Patch667: 0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch # END OF PATCH DEFINITIONS %endif @@ -1348,6 +1350,8 @@ ApplyPatch netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #CVE-2016-3135 rhbz 1318172 1318270 ApplyPatch ipv4-Dont-do-expensive-useless-work-during-inetdev-des.patch +#rhbz 1317300 1317179 +ApplyPatch 0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch # END OF PATCH APPLICATIONS %endif @@ -2197,6 +2201,9 @@ fi # # %changelog +* Wed Mar 16 2016 Laura Abbott <labbott@redhat.com> +- Revert patch causing radeon breakage (rhbz 1317300 1317179) + * Wed Mar 16 2016 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2016-3135 ipv4: DoS when destroying a network interface (rhbz 1318172 1318270) |