rpms/kernel/devel drm-i915-resume-force-mode.patch, 1.1, 1.2 kernel.spec, 1.1473, 1.1474
Dave Jones
davej at fedoraproject.org
Thu Mar 26 18:46:44 UTC 2009
- Previous message: rpms/libvirt-qpid/F-10 import.log, NONE, 1.1 libvirt-qpid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/libvirt-qpid/devel import.log, 1.1, 1.2 libvirt-qpid.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19131
Modified Files:
drm-i915-resume-force-mode.patch kernel.spec
Log Message:
Check for modesetting enabled before forcing mode on 915. (#490336)
drm-i915-resume-force-mode.patch:
Index: drm-i915-resume-force-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-i915-resume-force-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-i915-resume-force-mode.patch 19 Feb 2009 05:04:44 -0000 1.1
+++ drm-i915-resume-force-mode.patch 26 Mar 2009 18:46:43 -0000 1.2
@@ -19,3 +19,32 @@
return 0;
}
+From f5192bce8be69e5b33d7579bc282fef4d673e2c1 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Sun, 15 Mar 2009 13:55:55 +0100
+Subject: [PATCH] Fix i915 nomodeset NULL deref. during PM resume
+
+drm_helper_resume_force_mode() would crash while attempting to
+iterate through crtc_list, which is uninitialized when is modesetting
+disabled.
+---
+ drivers/gpu/drm/i915/i915_suspend.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
+index ef5fb6e..b138032 100644
+--- a/drivers/gpu/drm/i915/i915_suspend.c
++++ b/drivers/gpu/drm/i915/i915_suspend.c
+@@ -520,7 +520,8 @@ int i915_restore_state(struct drm_device *dev)
+
+ i915_restore_vga(dev);
+
+- drm_helper_resume_force_mode(dev);
++ if (drm_core_check_feature(dev, DRIVER_MODESET))
++ drm_helper_resume_force_mode(dev);
+
+ return 0;
+ }
+--
+1.6.2
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1473
retrieving revision 1.1474
diff -u -r1.1473 -r1.1474
--- kernel.spec 26 Mar 2009 18:15:39 -0000 1.1473
+++ kernel.spec 26 Mar 2009 18:46:43 -0000 1.1474
@@ -1820,6 +1820,9 @@
%changelog
* Thu Mar 26 2009 Dave Jones <davej at redhat.com>
+- Check for modesetting enabled before forcing mode on 915. (#490336)
+
+* Thu Mar 26 2009 Dave Jones <davej at redhat.com>
- Set kernel-PAE as default in grub. (#487578)
* Thu Mar 26 2009 Dave Jones <davej at redhat.com>
- Previous message: rpms/libvirt-qpid/F-10 import.log, NONE, 1.1 libvirt-qpid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/libvirt-qpid/devel import.log, 1.1, 1.2 libvirt-qpid.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list