Linux v3.8.7
Also drop some tegra patches that aren't being applied at all
This commit is contained in:
parent
8924cb541f
commit
1eac3cd513
|
@ -1,36 +0,0 @@
|
|||
From 0bc8d69a3bbbb261fdaadd759adbd8e60da72e36 Mon Sep 17 00:00:00 2001
|
||||
From: Jani Nikula <jani.nikula@intel.com>
|
||||
Date: Tue, 22 Jan 2013 12:50:35 +0200
|
||||
Subject: [PATCH] drm/i915: add quirk to invert brightness on eMachines e725
|
||||
|
||||
Upstream commit 01e3a8feb40e54b962a20fa7eb595c5efef5e109
|
||||
|
||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=31522#c35
|
||||
[Note: There are more than one broken setups in the bug. This fixes one.]
|
||||
Reported-by: Martins <andrissr@inbox.lv>
|
||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
||||
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_display.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||||
index e6e4df7..6292677 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||||
@@ -8899,6 +8899,12 @@ static struct intel_quirk intel_quirks[] = {
|
||||
/* Acer Aspire 5734Z must invert backlight brightness */
|
||||
{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
|
||||
|
||||
+ /* Acer/eMachines G725 */
|
||||
+ { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
|
||||
+
|
||||
+ /* Acer/eMachines e725 */
|
||||
+ { 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
|
||||
+
|
||||
/* Acer Aspire 4736Z */
|
||||
{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
|
||||
};
|
||||
--
|
||||
1.8.1.4
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
From f1a9a149abc86903e81dd1b2e720f3f89874384b Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||||
Date: Tue, 2 Apr 2013 11:11:52 +0200
|
||||
Subject: HID: magicmouse: fix race between input_register() and probe()
|
||||
|
||||
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||||
|
||||
commit f1a9a149abc86903e81dd1b2e720f3f89874384b upstream.
|
||||
|
||||
Since kernel 3.7, it appears that the input registration occured before
|
||||
the end of magicmouse_setup_input(). This is shown by receiving a lot of
|
||||
"EV_SYN SYN_REPORT 1" instead of normal "EV_SYN SYN_REPORT 0".
|
||||
This value means that the output buffer is full, and the user space
|
||||
is loosing events.
|
||||
|
||||
Using .input_configured guarantees that the race is not occuring, and that
|
||||
the call of "input_set_events_per_packet(input, 60)" is taken into account
|
||||
by input_register().
|
||||
|
||||
Fixes:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=908604
|
||||
|
||||
Reported-and-Tested-By: Clarke Wixon <cwixon@usa.net>
|
||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||||
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
|
||||
---
|
||||
drivers/hid/hid-magicmouse.c | 29 ++++++++++++++++++++---------
|
||||
1 file changed, 20 insertions(+), 9 deletions(-)
|
||||
|
||||
--- a/drivers/hid/hid-magicmouse.c
|
||||
+++ b/drivers/hid/hid-magicmouse.c
|
||||
@@ -462,6 +462,21 @@ static int magicmouse_input_mapping(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static void magicmouse_input_configured(struct hid_device *hdev,
|
||||
+ struct hid_input *hi)
|
||||
+
|
||||
+{
|
||||
+ struct magicmouse_sc *msc = hid_get_drvdata(hdev);
|
||||
+
|
||||
+ int ret = magicmouse_setup_input(msc->input, hdev);
|
||||
+ if (ret) {
|
||||
+ hid_err(hdev, "magicmouse setup input failed (%d)\n", ret);
|
||||
+ /* clean msc->input to notify probe() of the failure */
|
||||
+ msc->input = NULL;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
static int magicmouse_probe(struct hid_device *hdev,
|
||||
const struct hid_device_id *id)
|
||||
{
|
||||
@@ -493,15 +508,10 @@ static int magicmouse_probe(struct hid_d
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
- /* We do this after hid-input is done parsing reports so that
|
||||
- * hid-input uses the most natural button and axis IDs.
|
||||
- */
|
||||
- if (msc->input) {
|
||||
- ret = magicmouse_setup_input(msc->input, hdev);
|
||||
- if (ret) {
|
||||
- hid_err(hdev, "magicmouse setup input failed (%d)\n", ret);
|
||||
- goto err_stop_hw;
|
||||
- }
|
||||
+ if (!msc->input) {
|
||||
+ hid_err(hdev, "magicmouse input not registered\n");
|
||||
+ ret = -ENOMEM;
|
||||
+ goto err_stop_hw;
|
||||
}
|
||||
|
||||
if (id->product == USB_DEVICE_ID_APPLE_MAGICMOUSE)
|
||||
@@ -568,6 +578,7 @@ static struct hid_driver magicmouse_driv
|
||||
.remove = magicmouse_remove,
|
||||
.raw_event = magicmouse_raw_event,
|
||||
.input_mapping = magicmouse_input_mapping,
|
||||
+ .input_configured = magicmouse_input_configured,
|
||||
};
|
||||
|
||||
static int __init magicmouse_init(void)
|
|
@ -1,10 +0,0 @@
|
|||
--- linux-2.6.42.noarch/drivers/staging/nvec/Kconfig.orig 2012-02-02 08:16:12.512727480 -0600
|
||||
+++ linux-2.6.42.noarch/drivers/staging/nvec/Kconfig 2012-02-01 18:44:56.674990109 -0600
|
||||
@@ -1,6 +1,6 @@
|
||||
config MFD_NVEC
|
||||
bool "NV Tegra Embedded Controller SMBus Interface"
|
||||
- depends on I2C && GPIOLIB && ARCH_TEGRA
|
||||
+ depends on I2C && GPIOLIB && ARCH_TEGRA && MFD_CORE=y
|
||||
help
|
||||
Say Y here to enable support for a nVidia compliant embedded
|
||||
controller.
|
|
@ -1,11 +0,0 @@
|
|||
--- linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c.orig 2012-05-23 06:59:19.797302757 -0500
|
||||
+++ linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c 2012-05-22 15:26:07.154823359 -0500
|
||||
@@ -190,7 +190,7 @@
|
||||
#endif
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
|
||||
+MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
|
||||
|
||||
static struct tegra_sdhci_platform_data * sdhci_tegra_dt_parse_pdata(
|
||||
struct platform_device *pdev)
|
23
kernel.spec
23
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 205
|
||||
%global baserelease 201
|
||||
%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 6
|
||||
%define stable_update 7
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
@ -722,9 +722,7 @@ Patch20001: 0002-x86-EFI-Calculate-the-EFI-framebuffer-size-instead-o.patch
|
|||
# ARM
|
||||
|
||||
# ARM tegra
|
||||
Patch21004: arm-tegra-nvec-kconfig.patch
|
||||
Patch21005: arm-tegra-usb-no-reset-linux33.patch
|
||||
Patch21006: arm-tegra-sdhci-module-fix.patch
|
||||
|
||||
#rhbz 754518
|
||||
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
|
||||
|
@ -795,12 +793,6 @@ Patch25007: fix-child-thread-introspection.patch
|
|||
#rhbz 844750
|
||||
Patch25008: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
|
||||
|
||||
#rhbz 908604
|
||||
Patch25009: HID-magicmouse-fix-race-between-input_register-and-probe.patch
|
||||
|
||||
#rhbz 871932
|
||||
Patch25010: 0001-drm-i915-add-quirk-to-invert-brightness-on-eMachines.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -1365,9 +1357,7 @@ ApplyPatch debug-bad-pte-modules.patch
|
|||
# ARM
|
||||
#
|
||||
|
||||
#ApplyPatch arm-tegra-nvec-kconfig.patch
|
||||
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
|
||||
#ApplyPatch arm-tegra-sdhci-module-fix.patch
|
||||
|
||||
#
|
||||
# bugfixes to drivers and filesystems
|
||||
|
@ -1546,12 +1536,6 @@ ApplyPatch fix-child-thread-introspection.patch
|
|||
|
||||
ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
|
||||
|
||||
#rhbz 908604
|
||||
ApplyPatch HID-magicmouse-fix-race-between-input_register-and-probe.patch
|
||||
|
||||
#rhbz 871932
|
||||
ApplyPatch 0001-drm-i915-add-quirk-to-invert-brightness-on-eMachines.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -2409,7 +2393,8 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Fri Apr 12 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
* Fri Apr 12 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.7-201
|
||||
- Linux v3.8.7
|
||||
- Enable CONFIG_LDM_PARTITION (rhbz 948636)
|
||||
|
||||
* Thu Apr 11 2013 Dave Jones <davej@redhat.com>
|
||||
|
|
Loading…
Reference in New Issue