rpms/kernel/devel drm-god-shut-up-about-edid-already.patch, NONE, 1.1 kernel.spec, 1.1758, 1.1759

[Adam Jackson]

Author: ajax

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

Modified Files:
	kernel.spec 
Added Files:
	drm-god-shut-up-about-edid-already.patch 
Log Message:
* Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
- Make DRM less chatty about EDID failures.  No one cares.


drm-god-shut-up-about-edid-already.patch:
 drm_edid.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE drm-god-shut-up-about-edid-already.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c.jx	2009-09-01 17:06:43.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_edid.c	2009-09-01 17:10:28.000000000 -0400
@@ -630,7 +630,6 @@ int drm_do_probe_ddc_edid(struct i2c_ada
 	if (i2c_transfer(adapter, msgs, 2) == 2)
 		return 0;
 
-	dev_info(&adapter->dev, "unable to read EDID block.\n");
 	return -1;
 }
 EXPORT_SYMBOL(drm_do_probe_ddc_edid);
@@ -643,8 +642,6 @@ static int drm_ddc_read_edid(struct drm_
 
 	ret = drm_do_probe_ddc_edid(adapter, buf, len);
 	if (ret != 0) {
-		dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
-			 drm_get_connector_name(connector));
 		goto end;
 	}
 	if (!edid_is_valid((struct edid *)buf)) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -p -r1.1758 -r1.1759
--- kernel.spec	1 Sep 2009 17:08:26 -0000	1.1758
+++ kernel.spec	1 Sep 2009 21:14:08 -0000	1.1759
@@ -691,6 +691,7 @@ Patch1824: drm-intel-next.patch
 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
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1309,6 +1310,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 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-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2005,6 +2007,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 01 2009 Adam Jackson <ajax at redhat.com>
+- Make DRM less chatty about EDID failures.  No one cares.
+
 * Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc8-git2
 - Blank out drm-intel-next: entire contents are now upstream.