From owner-svn-src-user@FreeBSD.ORG  Sat Nov  2 13:14:46 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 ESMTP id B6C47A0B;
 Sat,  2 Nov 2013 13:14:46 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
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 A497724EE;
 Sat,  2 Nov 2013 13:14:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2DEknP082356;
 Sat, 2 Nov 2013 13:14:46 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2DEkmn082355;
 Sat, 2 Nov 2013 13:14:46 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201311021314.rA2DEkmn082355@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sat, 2 Nov 2013 13:14:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257544 - user/ed/newcons/sys/dev/drm2
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 13:14:46 -0000

Author: dumbbell
Date: Sat Nov  2 13:14:46 2013
New Revision: 257544
URL: http://svnweb.freebsd.org/changeset/base/257544

Log:
  drm: Log error if we fail to attach fbd device

Modified:
  user/ed/newcons/sys/dev/drm2/drm_fb_helper.c

Modified: user/ed/newcons/sys/dev/drm2/drm_fb_helper.c
==============================================================================
--- user/ed/newcons/sys/dev/drm2/drm_fb_helper.c	Sat Nov  2 11:37:16 2013	(r257543)
+++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c	Sat Nov  2 13:14:46 2013	(r257544)
@@ -1034,9 +1034,14 @@ int drm_fb_helper_single_fb_probe(struct
 
 #if defined(__FreeBSD__)
 	if (new_fb) {
+		device_t fbd;
+		int ret;
+
 		kdev = fb_helper->dev->device;
-		device_add_child(kdev, "fbd", device_get_unit(kdev));
-		bus_generic_attach(kdev);
+		fbd = device_add_child(kdev, "fbd", device_get_unit(kdev));
+		ret = device_probe_and_attach(fbd);
+		if (ret != 0)
+			DRM_ERROR("Failed to attach fbd device: %d\n", ret);
 	}
 #else
 	if (new_fb) {