rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Bring back drm-upgrayed-fixes.patch, dropped in the 

2.6.32.16 update. (#620955)
- Revert upstream DRM stable fix we already have:
    drm-i915-give-up-on-8xx-lid-status.patch
This commit is contained in:
Chuck Ebbert 2010-08-10 11:10:03 -04:00
parent 60c14ff824
commit f2a8acbfe3
4 changed files with 1141 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1092
drm-upgrayed-fixes.patch Normal file
View File

File diff suppressed because it is too large Load Diff

4
drm-upgrayedd.patch
View File

@ -11499,8 +11499,8 @@ index 0e0e4b4..b1d0acb 100644
};
@@ -622,7 +650,7 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect
if (IS_I8XX(dev))
return connector_status_connected;
{
enum drm_connector_status status = connector_status_connected;
- if (!acpi_lid_open() && !dmi_check_system(bad_lid_status))
+ if (!dmi_check_system(bad_lid_status) && !acpi_lid_open())

8
kernel.spec
View File

@ -716,6 +716,7 @@ Patch1700: linux-2.6-x86-64-fbdev-primary.patch
# nouveau + drm fixes
Patch1810: drm-upgrayedd.patch
Patch1811: drm-upgrayed-fixes.patch
Patch1813: drm-radeon-pm.patch
#Patch1814: drm-nouveau.patch
Patch1818: drm-i915-resume-force-mode.patch
@ -1461,6 +1462,7 @@ ApplyPatch linux-2.6-phylib-autoload.patch
ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
# Nouveau DRM + drm fixes
ApplyPatch drm-upgrayedd.patch
ApplyPatch drm-upgrayed-fixes.patch
#ApplyPatch drm-intel-big-hammer.patch
#ApplyPatch drm-intel-no-tv-hotplug.patch
ApplyOptionalPatch drm-intel-next.patch
@ -2219,6 +2221,12 @@ fi
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
* Sat Aug 07 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.18-158.rc1
- Bring back drm-upgrayed-fixes.patch, dropped in the
2.6.32.16 update. (#620955)
- Revert upstream DRM stable fix we already have:
drm-i915-give-up-on-8xx-lid-status.patch
* Sat Aug 07 2010 Chuck Ebbert <cebbert@redhat.com>
- Linux 2.6.32.18-rc1
- Revert DRM patches from -stable we already have:

39
linux-2.6-upstream-reverts.patch
View File

@ -1,3 +1,42 @@
From 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 12 Feb 2010 09:30:00 -0800
Subject: drm/i915: give up on 8xx lid status
From: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 upstream.
These old machines more often than not lie about their lid state. So
don't use it to detect LVDS presence, but leave the event handler to
deal with lid open/close, when we might need to reset the mode.
Fixes kernel bug #15248
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/gpu/drm/i915/intel_lvds.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -648,8 +648,12 @@ static const struct dmi_system_id bad_li
*/
static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
{
+ struct drm_device *dev = connector->dev;
enum drm_connector_status status = connector_status_connected;
+ if (IS_I8XX(dev))
+ return connector_status_connected;
+
if (!acpi_lid_open() && !dmi_check_system(bad_lid_status))
status = connector_status_disconnected;
From 6363ee6f496eb7e3b3f78dc105e522c7b496089b Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Tue, 24 Nov 2009 09:48:44 +0800