svn commit: r257545 - user/ed/newcons/sys/dev/drm2/radeon

[Jean-Sebastien Pedron]

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);
+}