Linux v3.11.4
This commit is contained in:
parent
01b5b507a8
commit
80224cd206
|
@ -1,58 +0,0 @@
|
|||
commit 360991867d83e10827d907ef67206986a98953b3
|
||||
Author: Alex Deucher <alexander.deucher@amd.com>
|
||||
Date: Sat Sep 21 14:37:49 2013 -0400
|
||||
|
||||
drm/radeon: don't set default clocks for SI when DPM is disabled
|
||||
|
||||
This is a partial revert of c6cf7777a32da874fabec4fd1c2a579f0ba4e4dd.
|
||||
|
||||
We need to take into account the clk voltage dependencies of the
|
||||
board. Not doing so can lead to stability issues on certain
|
||||
boards if the clks exceed the levels in the dep tables.
|
||||
|
||||
DPM already takes that into account, so for optimal performance,
|
||||
use DPM.
|
||||
|
||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
Cc: stable@vger.kernel.org
|
||||
|
||||
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
|
||||
index 87e1d69..ac07ad1 100644
|
||||
--- a/drivers/gpu/drm/radeon/radeon_pm.c
|
||||
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
|
||||
@@ -1002,7 +1002,7 @@ static void radeon_pm_resume_old(struct radeon_device *rdev)
|
||||
{
|
||||
/* set up the default clocks if the MC ucode is loaded */
|
||||
if ((rdev->family >= CHIP_BARTS) &&
|
||||
- (rdev->family <= CHIP_HAINAN) &&
|
||||
+ (rdev->family <= CHIP_CAYMAN) &&
|
||||
rdev->mc_fw) {
|
||||
if (rdev->pm.default_vddc)
|
||||
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
|
||||
@@ -1046,7 +1046,7 @@ static void radeon_pm_resume_dpm(struct radeon_device *rdev)
|
||||
if (ret) {
|
||||
DRM_ERROR("radeon: dpm resume failed\n");
|
||||
if ((rdev->family >= CHIP_BARTS) &&
|
||||
- (rdev->family <= CHIP_HAINAN) &&
|
||||
+ (rdev->family <= CHIP_CAYMAN) &&
|
||||
rdev->mc_fw) {
|
||||
if (rdev->pm.default_vddc)
|
||||
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
|
||||
@@ -1097,7 +1097,7 @@ static int radeon_pm_init_old(struct radeon_device *rdev)
|
||||
radeon_pm_init_profile(rdev);
|
||||
/* set up the default clocks if the MC ucode is loaded */
|
||||
if ((rdev->family >= CHIP_BARTS) &&
|
||||
- (rdev->family <= CHIP_HAINAN) &&
|
||||
+ (rdev->family <= CHIP_CAYMAN) &&
|
||||
rdev->mc_fw) {
|
||||
if (rdev->pm.default_vddc)
|
||||
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
|
||||
@@ -1183,7 +1183,7 @@ static int radeon_pm_init_dpm(struct radeon_device *rdev)
|
||||
if (ret) {
|
||||
rdev->pm.dpm_enabled = false;
|
||||
if ((rdev->family >= CHIP_BARTS) &&
|
||||
- (rdev->family <= CHIP_HAINAN) &&
|
||||
+ (rdev->family <= CHIP_CAYMAN) &&
|
||||
rdev->mc_fw) {
|
||||
if (rdev->pm.default_vddc)
|
||||
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
|
|
@ -1,49 +0,0 @@
|
|||
From 5f4513864304672e6ea9eac60583eeac32e679f2 Mon Sep 17 00:00:00 2001
|
||||
From: Henrik Rydberg <rydberg@euromail.se>
|
||||
Date: Thu, 26 Sep 2013 06:33:16 +0000
|
||||
Subject: hwmon: (applesmc) Check key count before proceeding
|
||||
|
||||
After reports from Chris and Josh Boyer of a rare crash in applesmc,
|
||||
Guenter pointed at the initialization problem fixed below. The patch
|
||||
has not been verified to fix the crash, but should be applied
|
||||
regardless.
|
||||
|
||||
Reported-by: <jwboyer@fedoraproject.org>
|
||||
Suggested-by: Guenter Roeck <linux@roeck-us.net>
|
||||
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
||||
---
|
||||
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
|
||||
index 62c2e32..98814d1 100644
|
||||
--- a/drivers/hwmon/applesmc.c
|
||||
+++ b/drivers/hwmon/applesmc.c
|
||||
@@ -525,16 +525,25 @@ static int applesmc_init_smcreg_try(void)
|
||||
{
|
||||
struct applesmc_registers *s = &smcreg;
|
||||
bool left_light_sensor, right_light_sensor;
|
||||
+ unsigned int count;
|
||||
u8 tmp[1];
|
||||
int ret;
|
||||
|
||||
if (s->init_complete)
|
||||
return 0;
|
||||
|
||||
- ret = read_register_count(&s->key_count);
|
||||
+ ret = read_register_count(&count);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+ if (s->cache && s->key_count != count) {
|
||||
+ pr_warn("key count changed from %d to %d\n",
|
||||
+ s->key_count, count);
|
||||
+ kfree(s->cache);
|
||||
+ s->cache = NULL;
|
||||
+ }
|
||||
+ s->key_count = count;
|
||||
+
|
||||
if (!s->cache)
|
||||
s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
|
||||
if (!s->cache)
|
||||
--
|
||||
cgit v0.9.2
|
19
kernel.spec
19
kernel.spec
|
@ -62,7 +62,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 201
|
||||
%global baserelease 200
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 3
|
||||
%define stable_update 4
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
@ -754,18 +754,12 @@ Patch25109: bonding-driver-alb-learning.patch
|
|||
Patch25114: elevator-Fix-a-race-in-elevator-switching-and-md.patch
|
||||
Patch25115: elevator-acquire-q-sysfs_lock-in-elevator_change.patch
|
||||
|
||||
#rhbz 1011719
|
||||
Patch25116: hwmon-applesmc-Check-key-count-before-proceeding.patch
|
||||
|
||||
#rhbz 974072
|
||||
Patch25117: rt2800-add-support-for-rf3070.patch
|
||||
|
||||
#rhbz 1005567
|
||||
Patch25118: bonding-driver-promisc.patch
|
||||
|
||||
#rhbz 1013814
|
||||
Patch25119: drm-radeon-dont-set-default-clocks-for-SI-when-DPM-is-disabled.patch
|
||||
|
||||
#CVE-2013-4387 rhbz 1011927 1015166
|
||||
Patch25121: ipv6-udp-packets-following-an-UFO-enqueued-packet-ne.patch
|
||||
|
||||
|
@ -1471,18 +1465,12 @@ ApplyPatch skge-fix-invalid-value-passed-to-pci_unmap_sigle.patch
|
|||
ApplyPatch elevator-Fix-a-race-in-elevator-switching-and-md.patch
|
||||
ApplyPatch elevator-acquire-q-sysfs_lock-in-elevator_change.patch
|
||||
|
||||
#rhbz 1011719
|
||||
ApplyPatch hwmon-applesmc-Check-key-count-before-proceeding.patch
|
||||
|
||||
#rhbz 974072
|
||||
ApplyPatch rt2800-add-support-for-rf3070.patch
|
||||
|
||||
#rhbz 1005567
|
||||
ApplyPatch bonding-driver-promisc.patch
|
||||
|
||||
#rhbz 1013814
|
||||
ApplyPatch drm-radeon-dont-set-default-clocks-for-SI-when-DPM-is-disabled.patch
|
||||
|
||||
#CVE-2013-4387 rhbz 1011927 1015166
|
||||
ApplyPatch ipv6-udp-packets-following-an-UFO-enqueued-packet-ne.patch
|
||||
|
||||
|
@ -2298,6 +2286,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Mon Oct 7 2013 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||
- Linux v3.11.4
|
||||
|
||||
* Thu Oct 3 2013 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2013-4387 ipv6: panic when UFO=On for an interface (rhbz 1011927 1015166)
|
||||
|
||||
|
|
Loading…
Reference in New Issue