From owner-svn-src-stable-9@FreeBSD.ORG  Fri Nov 23 11:23:16 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ED14CE23;
 Fri, 23 Nov 2012 11:23:15 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D09418FC0C;
 Fri, 23 Nov 2012 11:23:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qANBNFq9002505;
 Fri, 23 Nov 2012 11:23:15 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qANBNFZJ002504;
 Fri, 23 Nov 2012 11:23:15 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201211231123.qANBNFZJ002504@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 23 Nov 2012 11:23:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243442 - stable/9/sys/dev/drm2
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Nov 2012 11:23:16 -0000

Author: glebius
Date: Fri Nov 23 11:23:15 2012
New Revision: 243442
URL: http://svnweb.freebsd.org/changeset/base/243442

Log:
  Merge r242467 from head:
    - If DRM_DEBUG_DEFAULT_ON is defined, then initialize drm_debug_flagi to
      all supported debugging bits.
    - If DRM_DEBUG_DEFAULT_ON isn't defined, then initialize drm_debug_flag
      to zero.
  
    DRM_DEBUG_DEFAULT_ON is defined when module is build with -DDEBUG_DRM
    or if kernel config has 'options DEBUG_DRM'.
  
    Reviewed by:  kib

Modified:
  stable/9/sys/dev/drm2/drm_drv.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drm_drv.c
==============================================================================
--- stable/9/sys/dev/drm2/drm_drv.c	Fri Nov 23 11:21:58 2012	(r243441)
+++ stable/9/sys/dev/drm2/drm_drv.c	Fri Nov 23 11:23:15 2012	(r243442)
@@ -44,9 +44,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/drm_mode.h>
 
 #ifdef DRM_DEBUG_DEFAULT_ON
-int drm_debug_flag = 1;
+int drm_debug_flag = (DRM_DEBUGBITS_DEBUG | DRM_DEBUGBITS_KMS |
+    DRM_DEBUGBITS_FAILED_IOCTL);
 #else
-int drm_debug_flag = 2;
+int drm_debug_flag = 0;
 #endif
 int drm_notyet_flag = 0;