rpms/kernel/devel drm-intel-make-lvds-work.patch, NONE, 1.1 kernel.spec, 1.1956, 1.1957

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8019

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-make-lvds-work.patch 
Log Message:
* Wed Mar 31 2010 Matthew Garrett <mjg at redhat.com>
- drm-intel-make-lvds-work.patch: Make sure LVDS gets turned back on


drm-intel-make-lvds-work.patch:
 intel_display.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE drm-intel-make-lvds-work.patch ---
diff -up linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c.orig linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c.orig	2010-03-31 16:59:39.901995671 -0400
+++ linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_display.c	2010-03-31 17:01:05.416996744 -0400
@@ -3757,7 +3757,6 @@ struct drm_crtc *intel_get_load_detect_p
 void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_mode)
 {
 	struct drm_encoder *encoder = &intel_output->enc;
-	struct drm_device *dev = encoder->dev;
 	struct drm_crtc *crtc = encoder->crtc;
 	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
 	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
@@ -3767,7 +3766,6 @@ void intel_release_load_detect_pipe(stru
 		intel_output->base.encoder = NULL;
 		intel_output->load_detect_temp = false;
 		crtc->enabled = drm_helper_crtc_in_use(crtc);
-		drm_helper_disable_unused_functions(dev);
 	}
 
 	/* Switch crtc and output back off if necessary */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -p -r1.1956 -r1.1957
--- kernel.spec	30 Mar 2010 04:23:59 -0000	1.1956
+++ kernel.spec	31 Mar 2010 21:02:58 -0000	1.1957
@@ -692,6 +692,8 @@ Patch1816: drm-nouveau-abi16.patch
 Patch1819: drm-intel-big-hammer.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
+# make sure the lvds comes back on lid open
+Patch1825: drm-intel-make-lvds-work.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -1295,6 +1297,7 @@ ApplyPatch drm_nouveau_ucode.patch
 # pm broken on my thinkpad t60p - airlied
 ApplyPatch drm-intel-big-hammer.patch
 ApplyOptionalPatch drm-intel-next.patch
+ApplyPatch drm-intel-make-lvds-work.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1982,6 +1985,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Wed Mar 31 2010 Matthew Garrett <mjg at redhat.com>
+- drm-intel-make-lvds-work.patch: Make sure LVDS gets turned back on
+
 * Tue Mar 30 2010 Kyle McMartin <kyle at redhat.com>
 - nuke linux-2.6-g5-therm-shutdown.patch, upstream now
 - nuke linux-2.6-dell-laptop-rfkill-fix.patch, upstream in different form