From: Greg Kroah-Hartman Date: Thu, 3 Oct 2013 02:47:10 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.0.99~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=196c576b209cdf1a6b68065256ab8a39be1e2aaa;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: alsa-compress-fix-compress-device-unregister.patch arm-mxs-stub-out-mxs_pm_init-for-config_pm.patch drm-i915-fix-gen4-digital-port-hotplug-definitions.patch hwmon-applesmc-check-key-count-before-proceeding.patch --- diff --git a/queue-3.10/alsa-compress-fix-compress-device-unregister.patch b/queue-3.10/alsa-compress-fix-compress-device-unregister.patch new file mode 100644 index 00000000000..f901d520202 --- /dev/null +++ b/queue-3.10/alsa-compress-fix-compress-device-unregister.patch @@ -0,0 +1,34 @@ +From 4028b6c4c03f213260e9290ff3a6b5439aad07ce Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Fri, 13 Sep 2013 17:43:17 +0100 +Subject: ALSA: compress: Fix compress device unregister. + +From: Liam Girdwood + +commit 4028b6c4c03f213260e9290ff3a6b5439aad07ce upstream. + +snd_unregister_device() should return the device type and not stream +direction. + +Signed-off-by: Liam Girdwood +Acked-by: Vinod Koul +Tested-by: Vinod Koul +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/compress_offload.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/core/compress_offload.c ++++ b/sound/core/compress_offload.c +@@ -837,7 +837,8 @@ static int snd_compress_dev_disconnect(s + struct snd_compr *compr; + + compr = device->device_data; +- snd_unregister_device(compr->direction, compr->card, compr->device); ++ snd_unregister_device(SNDRV_DEVICE_TYPE_COMPRESS, compr->card, ++ compr->device); + return 0; + } + diff --git a/queue-3.10/arm-mxs-stub-out-mxs_pm_init-for-config_pm.patch b/queue-3.10/arm-mxs-stub-out-mxs_pm_init-for-config_pm.patch new file mode 100644 index 00000000000..ed07c034385 --- /dev/null +++ b/queue-3.10/arm-mxs-stub-out-mxs_pm_init-for-config_pm.patch @@ -0,0 +1,34 @@ +From 7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 3 Jun 2013 16:00:22 +0200 +Subject: ARM: mxs: stub out mxs_pm_init for !CONFIG_PM + +From: Arnd Bergmann + +commit 7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 upstream. + +When building a kernel without CONFIG_PM, we get a link +error from referencing mxs_pm_init in the machine +descriptor. This defines a macro to NULL for that case. + +Signed-off-by: Arnd Bergmann +Acked-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-mxs/pm.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/arm/mach-mxs/pm.h ++++ b/arch/arm/mach-mxs/pm.h +@@ -9,6 +9,10 @@ + #ifndef __ARCH_MXS_PM_H + #define __ARCH_MXS_PM_H + ++#ifdef CONFIG_PM + void mxs_pm_init(void); ++#else ++#define mxs_pm_init NULL ++#endif + + #endif diff --git a/queue-3.10/drm-i915-fix-gen4-digital-port-hotplug-definitions.patch b/queue-3.10/drm-i915-fix-gen4-digital-port-hotplug-definitions.patch new file mode 100644 index 00000000000..24027156edf --- /dev/null +++ b/queue-3.10/drm-i915-fix-gen4-digital-port-hotplug-definitions.patch @@ -0,0 +1,58 @@ +From 0ce99f749b3834edeb500e17d6ad17e86b60ff83 Mon Sep 17 00:00:00 2001 +From: Daniel Vetter +Date: Fri, 26 Jul 2013 11:27:49 +0200 +Subject: drm/i915: fix gen4 digital port hotplug definitions + +From: Daniel Vetter + +commit 0ce99f749b3834edeb500e17d6ad17e86b60ff83 upstream. + +Apparently Bspec is wrong in this case here even for gm45. Note that +Bspec is horribly misguided on i965g/gm, so we don't have any other +data points besides that it seems to make machines work better. + +With this changes all the bits in PORT_HOTPLUG_STAT for the digital +ports are ordered the same way. This seems to agree with what register +dumps from the hpd storm handling code shows, where the LIVE bit and +the short/long pulse STATUS bits light up at the same time with this +enumeration (but no with the one from Bspec). + +Also tested on my gm45 which has two DP+ ports, and everything seems +to still work as expected. + +References: http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg23054.html +Cc: Egbert Eich +Cc: Jan Niggemann +Tested-by: Jan Niggemann +[danvet: Add a big warning that Bspec seems to be wrong for these +bits, suggested by Jani.] +Acked-by: Jani Nikula +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/i915_reg.h | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -1675,10 +1675,16 @@ + #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) + + #define PORT_HOTPLUG_STAT (dev_priv->info->display_mmio_offset + 0x61114) +-/* HDMI/DP bits are gen4+ */ +-#define PORTB_HOTPLUG_LIVE_STATUS (1 << 29) ++/* ++ * HDMI/DP bits are gen4+ ++ * ++ * WARNING: Bspec for hpd status bits on gen4 seems to be completely confused. ++ * Please check the detailed lore in the commit message for for experimental ++ * evidence. ++ */ ++#define PORTD_HOTPLUG_LIVE_STATUS (1 << 29) + #define PORTC_HOTPLUG_LIVE_STATUS (1 << 28) +-#define PORTD_HOTPLUG_LIVE_STATUS (1 << 27) ++#define PORTB_HOTPLUG_LIVE_STATUS (1 << 27) + #define PORTD_HOTPLUG_INT_STATUS (3 << 21) + #define PORTC_HOTPLUG_INT_STATUS (3 << 19) + #define PORTB_HOTPLUG_INT_STATUS (3 << 17) diff --git a/queue-3.10/hwmon-applesmc-check-key-count-before-proceeding.patch b/queue-3.10/hwmon-applesmc-check-key-count-before-proceeding.patch new file mode 100644 index 00000000000..0d20dfa5fc9 --- /dev/null +++ b/queue-3.10/hwmon-applesmc-check-key-count-before-proceeding.patch @@ -0,0 +1,53 @@ +From 5f4513864304672e6ea9eac60583eeac32e679f2 Mon Sep 17 00:00:00 2001 +From: Henrik Rydberg +Date: Thu, 26 Sep 2013 08:33:16 +0200 +Subject: hwmon: (applesmc) Check key count before proceeding + +From: Henrik Rydberg + +commit 5f4513864304672e6ea9eac60583eeac32e679f2 upstream. + +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: +Suggested-by: Guenter Roeck +Signed-off-by: Henrik Rydberg +Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwmon/applesmc.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- 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) diff --git a/queue-3.10/series b/queue-3.10/series index 0b2d38870cc..8d7da07e79a 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -46,3 +46,7 @@ drm-radeon-make-r100_cp_ring_info-and-radeon_ring_gfx-safe-v2.patch drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch drm-radeon-fix-hdmi-audio-on-dce3.0-3.1-asics.patch +arm-mxs-stub-out-mxs_pm_init-for-config_pm.patch +hwmon-applesmc-check-key-count-before-proceeding.patch +alsa-compress-fix-compress-device-unregister.patch +drm-i915-fix-gen4-digital-port-hotplug-definitions.patch