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

 #include
 #include "radeon.h"
-#include
+#include
-int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
-                     struct drm_mode_fb_cmd2 *mode_cmd,
+struct drm_framebuffer *main_fb;
-                     struct drm_gem_object **gobj_p);
+struct drm_gem_object  *main_fb_obj;
 /* object hierarchy -
 	aligned += pitch_mask;
 	aligned &= ~pitch_mask;
 	return aligned;
+}
+static void radeonfb_destroy_pinned_object(struct drm_gem_object *gobj)
+{
+	struct radeon_bo *rbo = gem_to_radeon_bo(gobj);
+	int ret;
+	ret = radeon_bo_reserve(rbo, false);
+	if (likely(ret == 0)) {
+		radeon_bo_kunmap(rbo);
+		radeon_bo_unpin(rbo);
+		radeon_bo_unreserve(rbo);
+	}
+	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_gem_object **gobj_p)
+{
+    struct radeon_device *rdev = rfbdev->rdev;
+    struct drm_gem_object *gobj = NULL;
+    struct radeon_bo *rbo = NULL;
+    bool fb_tiled = false; /* useful for testing */
+    u32 tiling_flags = 0;
+    int ret;
+    int aligned_size, size;
+    int height = mode_cmd->height;
+    u32 bpp, depth;
+    drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
+    /* need to align pitch with crtc limits */
+    mode_cmd->pitches[0] = radeon_align_pitch(rdev, mode_cmd->width, bpp,
+                          fb_tiled) * ((bpp + 1) / 8);
+    if (rdev->family >= CHIP_R600)
+        height = ALIGN(mode_cmd->height, 8);
+    size = mode_cmd->pitches[0] * height;
+    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);
+    if (fb_tiled)
+        tiling_flags = RADEON_TILING_MACRO;
+#ifdef __BIG_ENDIAN
+	switch (bpp) {
+	case 32:
+		tiling_flags |= RADEON_TILING_SWAP_32BIT;
+		break;
+	case 16:
+		tiling_flags |= RADEON_TILING_SWAP_16BIT;
+	default:
+		break;
+	}
+#endif
+//    if (tiling_flags) {
+//        ret = radeon_bo_set_tiling_flags(rbo,
+//                         tiling_flags | RADEON_TILING_SURFACE,
+//                         mode_cmd->pitches[0]);
+//        if (ret)
+//            dev_err(rdev->dev, "FB failed to set tiling flags\n");
+//    }
+	ret = radeon_bo_reserve(rbo, false);
+	if (unlikely(ret != 0))
+		goto out_unref;
+	/* Only 27 bit offset for legacy CRTC */
+	ret = radeon_bo_pin_restricted(rbo, RADEON_GEM_DOMAIN_VRAM,
+				       ASIC_IS_AVIVO(rdev) ? 0 : 1 << 27,
+				       NULL);
+	if (ret) {
+		radeon_bo_unreserve(rbo);
+		goto out_unref;
+	}
+	radeon_bo_unreserve(rbo);
+	if (ret) {
+		goto out_unref;
+	}
+    *gobj_p = gobj;
+    return 0;
+out_unref:
+	radeonfb_destroy_pinned_object(gobj);
+	*gobj_p = NULL;
+	return ret;
+}
-static int radeonfb_create(struct radeon_fbdev *rfbdev,
+static int radeonfb_create(struct drm_fb_helper *helper,
+			   struct drm_fb_helper_surface_size *sizes)
 			   struct drm_fb_helper_surface_size *sizes)
 	struct radeon_fbdev *rfbdev = (struct radeon_fbdev *)helper;
 	struct radeon_device *rdev = rfbdev->rdev;
 	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;
 	int ret;
-    ENTER();
+	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);
-	if (info == NULL) {
-        dbgprintf("framebuffer_alloc\n");
+	if (info == NULL) {
 		ret = -ENOMEM;
 		goto out_unref;
+	}
 	info->par = rfbdev;
 	ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
 	if (ret) {
-		DRM_ERROR("failed to initalise framebuffer %d\n", ret);
+		DRM_ERROR("failed to initialize framebuffer %d\n", ret);
 	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
 	info->apertures->ranges[0].size = rdev->mc.aper_size;
-	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
-//   if (info->screen_base == NULL) {
-//       ret = -ENOSPC;
+	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
 //       goto out_unref;
 //   }
 	DRM_INFO("fb mappable at 0x%lX\n",  info->fix.smem_start);
 	DRM_INFO("vram apper at 0x%lX\n",  (unsigned long)rdev->mc.aper_base);
 	DRM_INFO("size %lu\n", (unsigned long)radeon_bo_size(rbo));
-	DRM_INFO("fb depth is %d\n", fb->depth);
-	DRM_INFO("   pitch is %d\n", fb->pitches[0]);
+	DRM_INFO("fb depth is %d\n", fb->depth);
+	DRM_INFO("   pitch is %d\n", fb->pitches[0]);
     main_fb = fb;
-    LEAVE();
+    main_fb_obj = gobj;
 		kfree(fb);
+	}
 	return ret;
+}
-static int radeon_fb_find_or_create_single(struct drm_fb_helper *helper,
-					   struct drm_fb_helper_surface_size *sizes)
-{
-	struct radeon_fbdev *rfbdev = (struct radeon_fbdev *)helper;
-	int new_fb = 0;
-	int ret;
-	if (!helper->fb) {
-		ret = radeonfb_create(rfbdev, sizes);
-		if (ret)
-			return ret;
-		new_fb = 1;
-	}
 	return new_fb;
 static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
+{
 	drm_framebuffer_cleanup(&rfb->base);
 	return 0;
 }
-static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
+static const struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
 	.gamma_set = radeon_crtc_fb_gamma_set,
 	.gamma_get = radeon_crtc_fb_gamma_get,
-	.fb_probe = radeon_fb_find_or_create_single,
-};
 	.fb_probe = radeonfb_create,
-extern struct radeon_fbdev *kos_rfbdev;
+};
 int radeon_fbdev_init(struct radeon_device *rdev)
+{
-	struct radeon_fbdev *rfbdev;
-	int bpp_sel = 32;
+	struct radeon_fbdev *rfbdev;
-	int ret;
+	int bpp_sel = 32;
 	int ret;
-    ENTER();
+ENTER();
 	if (!rfbdev)
 		return -ENOMEM;
 	rfbdev->rdev = rdev;
+	rdev->mode_info.rfbdev = rfbdev;
-	rdev->mode_info.rfbdev = rfbdev;
+	drm_fb_helper_prepare(rdev->ddev, &rfbdev->helper,
-	rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+			      &radeon_fb_helper_funcs);
 	ret = drm_fb_helper_init(rdev->ddev, &rfbdev->helper,
 				 rdev->num_crtc,
 				 RADEONFB_CONN_LIMIT);
 	if (ret) {
 		kfree(rfbdev);
 		return ret;
-	}
+	}
+	drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
 	drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
-	drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+	/* disable all the possible outputs/crtcs before entering KMS mode */
 	drm_helper_disable_unused_functions(rdev->ddev);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fb.c – Rev 2997 → 5078