From owner-svn-src-user@FreeBSD.ORG Sat Nov 2 13:16:02 2013 Return-Path: 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 08D90AF6; Sat, 2 Nov 2013 13:16:02 +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 CFBE824F6; Sat, 2 Nov 2013 13:16: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 rA2DG1GI082584; Sat, 2 Nov 2013 13:16:01 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2DG1QQ082580; Sat, 2 Nov 2013 13:16:01 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201311021316.rA2DG1QQ082580@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sat, 2 Nov 2013 13:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257545 - user/ed/newcons/sys/dev/drm2/radeon 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 13:16:02 -0000 Author: dumbbell Date: Sat Nov 2 13:16:00 2013 New Revision: 257545 URL: http://svnweb.freebsd.org/changeset/base/257545 Log: drm/radeon: Implement the FB_GETINFO() newbus callback Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon.h user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c user/ed/newcons/sys/dev/drm2/radeon/radeon_fb.c Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon.h ============================================================================== --- user/ed/newcons/sys/dev/drm2/radeon/radeon.h Sat Nov 2 13:14:46 2013 (r257544) +++ user/ed/newcons/sys/dev/drm2/radeon/radeon.h Sat Nov 2 13:16:00 2013 (r257545) @@ -2041,6 +2041,9 @@ void radeon_pm_acpi_event_handler(struct int radeon_ttm_init(struct radeon_device *rdev); void radeon_ttm_fini(struct radeon_device *rdev); +/* radeon_fb.c */ +struct fb_info * radeon_fb_helper_getinfo(device_t kdev); + /* r600.c */ int r600_ih_ring_alloc(struct radeon_device *rdev); void r600_ih_ring_fini(struct radeon_device *rdev); Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c ============================================================================== --- user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Sat Nov 2 13:14:46 2013 (r257544) +++ user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.c Sat Nov 2 13:16:00 2013 (r257545) @@ -489,27 +489,7 @@ radeon_resume(device_t kdev) return (-ret); } -static struct fb_info * -radeon_fb_helper_getinfo(device_t kdev) -{ -#if 0 /* XXX */ - struct drm_device *dev; - struct radeon_mode_info *mode_info; - struct radeon_fbdev *rfbdev; - struct radeon_device *rdev; - struct fb_info *info; - - - dev = device_get_softc(kdev); - rdev = dev->dev_private; - mode_info = &rdev->mode_info; - rfbdev = mode_info->rfbdev; - info = rfbdev->helper.fbdev; - return (info); -#else - return (NULL); -#endif -} +extern struct fb_info * radeon_fb_helper_getinfo(device_t kdev); static device_method_t radeon_methods[] = { /* Device interface */ Modified: user/ed/newcons/sys/dev/drm2/radeon/radeon_fb.c ============================================================================== --- user/ed/newcons/sys/dev/drm2/radeon/radeon_fb.c Sat Nov 2 13:14:46 2013 (r257544) +++ user/ed/newcons/sys/dev/drm2/radeon/radeon_fb.c Sat Nov 2 13:16:00 2013 (r257545) @@ -375,3 +375,22 @@ bool radeon_fbdev_robj_is_fb(struct rade return true; return false; } + +struct fb_info * +radeon_fb_helper_getinfo(device_t kdev) +{ + struct drm_device *dev; + struct radeon_device *rdev; + struct radeon_fbdev *rfbdev; + struct fb_info *info; + + dev = device_get_softc(kdev); + rdev = dev->dev_private; + rfbdev = rdev->mode_info.rfbdev; + if (rfbdev == NULL) + return (NULL); + + info = rfbdev->helper.fbdev; + + return (info); +}