From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 22 17:19:40 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75DE952E; Sat, 22 Nov 2014 17:19:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 487D1AD0; Sat, 22 Nov 2014 17:19:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMHJeX6081993; Sat, 22 Nov 2014 17:19:40 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMHJd3o081990; Sat, 22 Nov 2014 17:19:39 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201411221719.sAMHJd3o081990@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Sat, 22 Nov 2014 17:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274862 - in stable/10/sys/dev/drm2: . radeon X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 17:19:40 -0000 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 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 */