svn commit: r259179 - in head/sys: dev/drm2 modules/drm2/drm2 modules/drm2/i915kms modules/drm2/radeonkms

[Aleksandr Rybalko]

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 <bsd.kmod.mk>

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 <bsd.kmod.mk>

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								\