WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_fb.c

 /* object hierarchy -
    this contains a helper + a radeon fb
    the helper contains a pointer to radeon framebuffer baseclass.
 */
 struct radeon_fbdev {
-    struct drm_fb_helper        helper;
+	struct drm_fb_helper helper;
 	struct radeon_framebuffer rfb;
 	struct list_head fbdev_list;
-	struct radeon_device		*rdev;
+	struct radeon_device *rdev;
 };
 static struct fb_ops radeonfb_ops = {
 	.owner = THIS_MODULE,
+	}
 	drm_gem_object_unreference_unlocked(gobj);
+}
 static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
-                     struct drm_mode_fb_cmd2 *mode_cmd,
+					 struct drm_mode_fb_cmd2 *mode_cmd,
-                     struct drm_gem_object **gobj_p)
+					 struct drm_gem_object **gobj_p)
 {
-    struct radeon_device *rdev = rfbdev->rdev;
+	struct radeon_device *rdev = rfbdev->rdev;
-    struct drm_gem_object *gobj = NULL;
+	struct drm_gem_object *gobj = NULL;
-    struct radeon_bo *rbo = NULL;
+	struct radeon_bo *rbo = NULL;
-    bool fb_tiled = false; /* useful for testing */
+	bool fb_tiled = false; /* useful for testing */
-    u32 tiling_flags = 0;
+	u32 tiling_flags = 0;
-    int ret;
+	int ret;
-    int aligned_size, size;
+	int aligned_size, size;
-    int height = mode_cmd->height;
+	int height = mode_cmd->height;
-    u32 bpp, depth;
+	u32 bpp, depth;
-    drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
+	drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
-    /* need to align pitch with crtc limits */
+	/* need to align pitch with crtc limits */
-    mode_cmd->pitches[0] = radeon_align_pitch(rdev, mode_cmd->width, bpp,
+	mode_cmd->pitches[0] = radeon_align_pitch(rdev, mode_cmd->width, bpp,
-                          fb_tiled) * ((bpp + 1) / 8);
+						  fb_tiled) * ((bpp + 1) / 8);
-    if (rdev->family >= CHIP_R600)
+	if (rdev->family >= CHIP_R600)
-        height = ALIGN(mode_cmd->height, 8);
+		height = ALIGN(mode_cmd->height, 8);
-    size = mode_cmd->pitches[0] * height;
+	size = mode_cmd->pitches[0] * height;
-    aligned_size = ALIGN(size, PAGE_SIZE);
+	aligned_size = ALIGN(size, PAGE_SIZE);
 	rbo = rdev->stollen_vga_memory;
 	gobj = &rbo->gem_base;
 	mutex_lock(&rdev->gem.mutex);
 	list_add_tail(&rbo->list, &rdev->gem.objects);
 	mutex_unlock(&rdev->gem.mutex);
-    rbo = gem_to_radeon_bo(gobj);
+	rbo = gem_to_radeon_bo(gobj);
-    if (fb_tiled)
+	if (fb_tiled)
-        tiling_flags = RADEON_TILING_MACRO;
+		tiling_flags = RADEON_TILING_MACRO;
 	radeon_bo_unreserve(rbo);
 	if (ret) {
 		goto out_unref;
+	}
-    *gobj_p = gobj;
+	*gobj_p = gobj;
-    return 0;
+	return 0;
 out_unref:
 	radeonfb_destroy_pinned_object(gobj);
 	*gobj_p = NULL;
 	return ret;
 	struct fb_info *info;
 	struct drm_framebuffer *fb = NULL;
 	struct drm_mode_fb_cmd2 mode_cmd;
 	struct drm_gem_object *gobj = NULL;
 	struct radeon_bo *rbo = NULL;
-	struct device *device = &rdev->pdev->dev;
 	int ret;
 	unsigned long tmp;
 	mode_cmd.width = sizes->surface_width;
+	}
 	rbo = gem_to_radeon_bo(gobj);
 	/* okay we have an object now allocate the framebuffer */
-	info = framebuffer_alloc(0, device);
+	info = drm_fb_helper_alloc_fbi(helper);
-	if (info == NULL) {
+	if (IS_ERR(info)) {
-		ret = -ENOMEM;
+		ret = PTR_ERR(info);
 		goto out_unref;
+	}
 	info->par = rfbdev;
-	info->par = rfbdev;
+	info->skip_vt_switch = true;
 	ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
 	if (ret) {
 		DRM_ERROR("failed to initialize framebuffer %d\n", ret);
-		goto out_unref;
+		goto out_destroy_fbi;
-	}
+	}
 	fb = &rfbdev->rfb.base;
 	info->screen_size = radeon_bo_size(rbo);
 	drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height);
-	/* setup aperture base/size for vesafb takeover */
-	info->apertures = alloc_apertures(1);
-	if (!info->apertures) {
-		ret = -ENOMEM;
 		goto out_unref;
 	/* setup aperture base/size for vesafb takeover */
 	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
 	DRM_INFO("   pitch is %d\n", fb->pitches[0]);
     main_fb = fb;
     main_fb_obj = gobj;
+	return 0;
-    return 0;
+out_destroy_fbi:
 //   drm_fb_helper_release_fbi(helper);
 out_unref:
+}
-static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
 static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
-	struct fb_info *info;
-	struct radeon_framebuffer *rfb = &rfbdev->rfb;
-	if (rfbdev->helper.fbdev) {
+{
-		info = rfbdev->helper.fbdev;
+	struct radeon_framebuffer *rfb = &rfbdev->rfb;
 //       unregister_framebuffer(info);
-//       framebuffer_release(info);
+//	drm_fb_helper_unregister_fbi(&rfbdev->helper);
 //	drm_fb_helper_release_fbi(&rfbdev->helper);
 int radeon_fbdev_init(struct radeon_device *rdev)
+{
 	struct radeon_fbdev *rfbdev;
 	int bpp_sel = 32;
 	int ret;
-ENTER();
 	/* select 8 bpp console on RN50 or 16MB cards */
 	if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
 			      &radeon_fb_helper_funcs);
 	ret = drm_fb_helper_init(rdev->ddev, &rfbdev->helper,
 				 rdev->num_crtc,
 				 RADEONFB_CONN_LIMIT);
-	if (ret) {
-		kfree(rfbdev);
+	if (ret)
-		return ret;
-	}
+		goto free;
+	ret = drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
 	if (ret)
-	drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
+		goto fini;
 	/* disable all the possible outputs/crtcs before entering KMS mode */
+	drm_helper_disable_unused_functions(rdev->ddev);
 	drm_helper_disable_unused_functions(rdev->ddev);
+	ret = drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+	if (ret)
+		goto fini;
+	return 0;
 fini:
-	drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+//   drm_fb_helper_fini(&rfbdev->helper);
-LEAVE();
+free:
 	kfree(rfbdev);
 	radeon_fbdev_destroy(rdev->ddev, rdev->mode_info.rfbdev);
 	kfree(rdev->mode_info.rfbdev);
 	rdev->mode_info.rfbdev = NULL;
+}
-int radeon_fbdev_total_size(struct radeon_device *rdev)
-{
-	struct radeon_bo *robj;
-	int size = 0;
-	robj = gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj);
-	size += radeon_bo_size(robj);
-	return size;
-}
 bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
+{
 	if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj))
 		return true;
 	return false;
+}
+void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector)
+{
+	drm_fb_helper_add_one_connector(&rdev->mode_info.rfbdev->helper, connector);
+}
+void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector)
+{
+	drm_fb_helper_remove_one_connector(&rdev->mode_info.rfbdev->helper, connector);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fb.c @ 5271 – Rev 5271 → 6104