From owner-svn-src-all@FreeBSD.ORG Sun Dec 22 23:52:11 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDD57E8F; Sun, 22 Dec 2013 23:52:11 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A907D1319; Sun, 22 Dec 2013 23:52:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMNqBux089697; Sun, 22 Dec 2013 23:52:11 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMNqBUE089696; Sun, 22 Dec 2013 23:52:11 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312222352.rBMNqBUE089696@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sun, 22 Dec 2013 23:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259755 - releng/10.0/sys/dev/drm2 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2013 23:52:11 -0000 Author: dumbbell Date: Sun Dec 22 23:52:11 2013 New Revision: 259755 URL: http://svnweb.freebsd.org/changeset/base/259755 Log: Merge from stable/10, r259745: drm: Lower priority of "EDID checksum is invalid" message The priority goes from "error" to "debug". Connectors are polled every 10 seconds. Reading EDID is part of this polling. However, when an invalid EDID is returned, this error message is logged. When using Newcons for instance, having a kernel message every 10 seconds is getting annoying. Now that it's a debug message, it'll be logged only if hw.dri.debug is enabled. This fix console spamming for some users. Tested by: Larry Rosenman Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/drm_edid.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/drm_edid.c ============================================================================== --- releng/10.0/sys/dev/drm2/drm_edid.c Sun Dec 22 23:41:14 2013 (r259754) +++ releng/10.0/sys/dev/drm2/drm_edid.c Sun Dec 22 23:52:11 2013 (r259755) @@ -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_ERROR("EDID checksum is invalid, remainder is %d\n", csum); + DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum); /* allow CEA to slide through, switches mangle this */ if (raw_edid[0] != 0x02)