rpms/kernel/devel drm-ddc-caching-bug.patch, NONE, 1.1 kernel.spec, 1.1764, 1.1765

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28841

Modified Files:
	kernel.spec 
Added Files:
	drm-ddc-caching-bug.patch 
Log Message:
* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
- drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
  disconnected.


drm-ddc-caching-bug.patch:
 drm_crtc_helper.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE drm-ddc-caching-bug.patch ---
When an output was disconnected, its mode list would remain.  If you later
plugged into a sink with no EDID (projector, etc), you'd inherit the mode
list from the old sink, which is not what you want.

diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-09-03 16:56:11.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-09-03 16:57:24.911505245 -0400
@@ -104,8 +104,7 @@ int drm_helper_probe_single_connector_mo
 	if (connector->status == connector_status_disconnected) {
 		DRM_DEBUG_KMS("%s is disconnected\n",
 			  drm_get_connector_name(connector));
-		/* TODO set EDID to NULL */
-		return 0;
+		goto prune;
 	}
 
 	count = (*connector_funcs->get_modes)(connector);
@@ -130,7 +129,7 @@ int drm_helper_probe_single_connector_mo
 								   mode);
 	}
 
-
+prune:
 	drm_mode_prune_invalid(dev, &connector->modes, true);
 
 	if (list_empty(&connector->modes))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -p -r1.1764 -r1.1765
--- kernel.spec	3 Sep 2009 21:02:14 -0000	1.1764
+++ kernel.spec	3 Sep 2009 21:47:33 -0000	1.1765
@@ -699,6 +699,7 @@ Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
 Patch1827: drm-rv710-ucode-fix.patch
 Patch1828: drm-god-shut-up-about-edid-already.patch
+Patch1829: drm-ddc-caching-bug.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1324,6 +1325,7 @@ ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 ApplyPatch drm-rv710-ucode-fix.patch
 ApplyPatch drm-god-shut-up-about-edid-already.patch
+ApplyPatch drm-ddc-caching-bug.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2020,6 +2022,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
+- drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
+  disconnected.
+
 * Thu Sep 03 2009 Jarod Wilson <jarod at redhat.com>
 - Update hdpvr and lirc_zilog drivers for 2.6.31 i2c