From owner-svn-src-all@FreeBSD.ORG Tue Dec 10 15:53:02 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 1DD17BAC; Tue, 10 Dec 2013 15:53:02 +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 F29591775; Tue, 10 Dec 2013 15:53:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAFr1mN003247; Tue, 10 Dec 2013 15:53:01 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAFr0jx003237; Tue, 10 Dec 2013 15:53:00 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201312101553.rBAFr0jx003237@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 10 Dec 2013 15:53:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259179 - in head/sys: dev/drm2 modules/drm2/drm2 modules/drm2/i915kms modules/drm2/radeonkms X-SVN-Group: head 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: Tue, 10 Dec 2013 15:53:02 -0000 Author: ray Date: Tue Dec 10 15:53:00 2013 New Revision: 259179 URL: http://svnweb.freebsd.org/changeset/base/259179 Log: Disable error message about failed attempt to attach fbd when drm2 built with syscons. Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/drmP.h head/sys/dev/drm2/drm_fb_helper.c head/sys/modules/drm2/drm2/Makefile head/sys/modules/drm2/i915kms/Makefile head/sys/modules/drm2/radeonkms/Makefile Modified: head/sys/dev/drm2/drmP.h ============================================================================== --- head/sys/dev/drm2/drmP.h Tue Dec 10 15:36:29 2013 (r259178) +++ head/sys/dev/drm2/drmP.h Tue Dec 10 15:53:00 2013 (r259179) @@ -113,6 +113,7 @@ struct drm_device; #include "opt_compat.h" #include "opt_drm.h" +#include "opt_syscons.h" #ifdef DRM_DEBUG #undef DRM_DEBUG #define DRM_DEBUG_DEFAULT_ON 1 Modified: head/sys/dev/drm2/drm_fb_helper.c ============================================================================== --- head/sys/dev/drm2/drm_fb_helper.c Tue Dec 10 15:36:29 2013 (r259178) +++ head/sys/dev/drm2/drm_fb_helper.c Tue Dec 10 15:53:00 2013 (r259179) @@ -1044,8 +1044,10 @@ int drm_fb_helper_single_fb_probe(struct kdev = fb_helper->dev->device; fbd = device_add_child(kdev, "fbd", device_get_unit(kdev)); ret = device_probe_and_attach(fbd); +#ifdef DEV_VT if (ret != 0) DRM_ERROR("Failed to attach fbd device: %d\n", ret); +#endif } #else if (new_fb) { Modified: head/sys/modules/drm2/drm2/Makefile ============================================================================== --- head/sys/modules/drm2/drm2/Makefile Tue Dec 10 15:36:29 2013 (r259178) +++ head/sys/modules/drm2/drm2/Makefile Tue Dec 10 15:53:00 2013 (r259179) @@ -54,6 +54,6 @@ SRCS += drm_ioc32.c .endif SRCS +=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \ - opt_vm.h opt_compat.h + opt_vm.h opt_compat.h opt_syscons.h .include Modified: head/sys/modules/drm2/i915kms/Makefile ============================================================================== --- head/sys/modules/drm2/i915kms/Makefile Tue Dec 10 15:36:29 2013 (r259178) +++ head/sys/modules/drm2/i915kms/Makefile Tue Dec 10 15:53:00 2013 (r259179) @@ -35,6 +35,6 @@ SRCS += i915_ioc32.c .endif SRCS += device_if.h fb_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h \ - opt_drm.h opt_compat.h + opt_drm.h opt_compat.h opt_syscons.h .include Modified: head/sys/modules/drm2/radeonkms/Makefile ============================================================================== --- head/sys/modules/drm2/radeonkms/Makefile Tue Dec 10 15:36:29 2013 (r259178) +++ head/sys/modules/drm2/radeonkms/Makefile Tue Dec 10 15:53:00 2013 (r259179) @@ -94,6 +94,7 @@ SRCS += \ opt_acpi.h \ opt_compat.h \ opt_drm.h \ + opt_syscons.h \ acpi_if.h \ bus_if.h \ fb_if.h \