Author: dumbbell
Date: Sat Nov 22 17:19:39 2014
New Revision: 274862
URL: https://svnweb.freebsd.org/changeset/base/274862
Log:
drm: Lower priority of three messages related to invalid EDID
Like in r259717, the prority goes from "error" to "debug" to avoid
spamming logs when the connectors are polled.
PR: 194770
Submitted by: Larry Rosenman <l...@lerctr.org>
MFC of: r273962, r274587
Modified:
stable/10/sys/dev/drm2/drm_edid.c
stable/10/sys/dev/drm2/radeon/radeon_connectors.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/drm2/drm_edid.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_edid.c Sat Nov 22 17:10:57 2014
(r274861)
+++ stable/10/sys/dev/drm2/drm_edid.c Sat Nov 22 17:19:39 2014
(r274862)
@@ -171,7 +171,7 @@ drm_edid_block_valid(u8 *raw_edid)
for (i = 0; i < EDID_LENGTH; i++)
csum += raw_edid[i];
if (csum) {
- DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum);
+ DRM_DEBUG_KMS("EDID checksum is invalid, remainder is %d\n",
csum);
/* allow CEA to slide through, switches mangle this */
if (raw_edid[0] != 0x02)
@@ -366,7 +366,7 @@ drm_do_get_edid(struct drm_connector *co
return block;
carp:
- DRM_ERROR("%s: EDID block %d invalid.\n",
+ DRM_DEBUG_KMS("%s: EDID block %d invalid.\n",
drm_get_connector_name(connector), j);
out:
Modified: stable/10/sys/dev/drm2/radeon/radeon_connectors.c
==============================================================================
--- stable/10/sys/dev/drm2/radeon/radeon_connectors.c Sat Nov 22 17:10:57
2014 (r274861)
+++ stable/10/sys/dev/drm2/radeon/radeon_connectors.c Sat Nov 22 17:19:39
2014 (r274862)
@@ -748,7 +748,7 @@ radeon_vga_detect(struct drm_connector *
radeon_connector->edid = drm_get_edid(&radeon_connector->base,
radeon_connector->ddc_bus->adapter);
if (!radeon_connector->edid) {
- DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
+ DRM_DEBUG_KMS("%s: probed a monitor but no|invalid
EDID\n",
drm_get_connector_name(connector));
ret = connector_status_connected;
} else {
@@ -954,7 +954,7 @@ radeon_dvi_detect(struct drm_connector *
radeon_connector->edid = drm_get_edid(&radeon_connector->base,
radeon_connector->ddc_bus->adapter);
if (!radeon_connector->edid) {
- DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
+ DRM_DEBUG_KMS("%s: probed a monitor but no|invalid
EDID\n",
drm_get_connector_name(connector));
/* rs690 seems to have a problem with connectors not
existing and always
* return a block of 0's. If we see this just stop
polling on this output */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
