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

  * DEALINGS IN THE SOFTWARE.
+ *
  * Authors:
  *     David Airlie
  */
-    /*
-     *  Modularization
-     */
 #include
 #include
 #include "drmP.h"
 #include "drm_fb_helper.h"
 #include
-#include "radeon_object.h"
+#include "radeon_object.h"
+/* object hierarchy -
+   this contains a helper + a radeon fb
-struct fb_info *framebuffer_alloc(size_t size, void *dev);
+   the helper contains a pointer to radeon framebuffer baseclass.
 */
-struct radeon_fb_device {
+struct radeon_fbdev {
+    struct drm_fb_helper        helper;
-    struct drm_fb_helper        helper;
+	struct radeon_framebuffer rfb;
-	struct radeon_framebuffer	*rfb;
+	struct list_head fbdev_list;
 	struct radeon_device		*rdev;
 };
 static struct fb_ops radeonfb_ops = {
-//   .owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
+//   .owner = THIS_MODULE,
-	.fb_set_par = drm_fb_helper_set_par,
+	.fb_check_var = drm_fb_helper_check_var,
-	.fb_setcolreg = drm_fb_helper_setcolreg,
+	.fb_set_par = drm_fb_helper_set_par,
 //	.fb_fillrect = cfb_fillrect,
 //	.fb_copyarea = cfb_copyarea,
 //	.fb_imageblit = cfb_imageblit,
 //	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
-};
-/**
- * Currently it is assumed that the old framebuffer is reused.
- *
- * LOCKING
- * caller should hold the mode config lock.
- *
- */
-int radeonfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
-{
-	struct fb_info *info;
-	struct drm_framebuffer *fb;
-	struct drm_display_mode *mode = crtc->desired_mode;
-	fb = crtc->fb;
-	if (fb == NULL) {
-		return 1;
-	}
-	info = fb->fbdev;
-	if (info == NULL) {
-		return 1;
-	}
-	if (mode == NULL) {
-		return 1;
-	}
-	info->var.xres = mode->hdisplay;
-	info->var.right_margin = mode->hsync_start - mode->hdisplay;
-	info->var.hsync_len = mode->hsync_end - mode->hsync_start;
-	info->var.left_margin = mode->htotal - mode->hsync_end;
-	info->var.yres = mode->vdisplay;
-	info->var.lower_margin = mode->vsync_start - mode->vdisplay;
-	info->var.vsync_len = mode->vsync_end - mode->vsync_start;
-	info->var.upper_margin = mode->vtotal - mode->vsync_end;
-	info->var.pixclock = 10000000 / mode->htotal * 1000 / mode->vtotal * 100;
-	/* avoid overflow */
-	info->var.pixclock = info->var.pixclock * 1000 / mode->vrefresh;
 	.fb_blank = drm_fb_helper_blank,
-	return 0;
+	.fb_setcmap = drm_fb_helper_setcmap,
 };
 EXPORT_SYMBOL(radeonfb_resize);
 	aligned += pitch_mask;
 	aligned &= ~pitch_mask;
 	return aligned;
+}
+static void radeonfb_destroy_pinned_object(struct drm_gem_object *gobj)
+{
+	struct radeon_bo *rbo = gobj->driver_private;
+	int ret;
-static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
+	ret = radeon_bo_reserve(rbo, false);
-	.gamma_set = radeon_crtc_fb_gamma_set,
+	if (likely(ret == 0)) {
+		radeon_bo_kunmap(rbo);
+		radeon_bo_unpin(rbo);
+		radeon_bo_unreserve(rbo);
+	}
-	.gamma_get = radeon_crtc_fb_gamma_get,
+//   drm_gem_object_unreference_unlocked(gobj);
-};
+}
-int radeonfb_create(struct drm_device *dev,
-		    uint32_t fb_width, uint32_t fb_height,
-		    uint32_t surface_width, uint32_t surface_height,
+static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
-		    uint32_t surface_depth, uint32_t surface_bpp,
+					 struct drm_mode_fb_cmd *mode_cmd,
-		    struct drm_framebuffer **fb_p)
+					 struct drm_gem_object **gobj_p)
-{
-	struct radeon_device *rdev = dev->dev_private;
-	struct fb_info *info;
-	struct radeon_fb_device *rfbdev;
-	struct drm_framebuffer *fb = NULL;
 	struct radeon_framebuffer *rfb;
-	struct drm_mode_fb_cmd mode_cmd;
+	struct radeon_device *rdev = rfbdev->rdev;
-	struct drm_gem_object *gobj = NULL;
-	struct radeon_bo *rbo = NULL;
-	struct device *device = &rdev->pdev->dev;
-	int size, aligned_size, ret;
-	u64 fb_gpuaddr;
-	void *fbptr = NULL;
+	struct drm_gem_object *gobj = NULL;
-	unsigned long tmp;
+	struct radeon_bo *rbo = NULL;
+	bool fb_tiled = false; /* useful for testing */
+	u32 tiling_flags = 0;
-	bool fb_tiled = false; /* useful for testing */
-	u32 tiling_flags = 0;
-    mode_cmd.width  = surface_width;
-	mode_cmd.height = surface_height;
-	/* avivo can't scanout real 24bpp */
-	if ((surface_bpp == 24) && ASIC_IS_AVIVO(rdev))
-		surface_bpp = 32;
+	int ret;
+	int aligned_size, size;
-	mode_cmd.bpp = surface_bpp;
-	/* need to align pitch with crtc limits */
-	mode_cmd.pitch = radeon_align_pitch(rdev, mode_cmd.width, mode_cmd.bpp, fb_tiled) * ((mode_cmd.bpp + 1) / 8);
+	/* need to align pitch with crtc limits */
-	mode_cmd.depth = surface_depth;
+	mode_cmd->pitch = radeon_align_pitch(rdev, mode_cmd->width, mode_cmd->bpp, fb_tiled) * ((mode_cmd->bpp + 1) / 8);
-	size = mode_cmd.pitch * mode_cmd.height;
-	aligned_size = ALIGN(size, PAGE_SIZE);
+	size = mode_cmd->pitch * mode_cmd->height;
+	aligned_size = ALIGN(size, PAGE_SIZE);
-	ret = radeon_gem_object_create(rdev, aligned_size, 0,
+//   ret = radeon_gem_object_create(rdev, aligned_size, 0,
-			RADEON_GEM_DOMAIN_VRAM,
+//           RADEON_GEM_DOMAIN_VRAM,
-			false, ttm_bo_type_kernel,
+//                      false, true,
-			&gobj);
+//           &gobj);
-	if (ret) {
-		printk(KERN_ERR "failed to allocate framebuffer (%d %d)\n",
+	if (ret) {
-		       surface_width, surface_height);
+		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",
-		ret = -ENOMEM;
+		       aligned_size);
-		goto out;
+		return -ENOMEM;
+	}
 	rbo = gobj->driver_private;
 	if (fb_tiled)
 		tiling_flags = RADEON_TILING_MACRO;
 #ifdef __BIG_ENDIAN
 #endif
 	if (tiling_flags) {
 		ret = radeon_bo_set_tiling_flags(rbo,
 					tiling_flags | RADEON_TILING_SURFACE,
-					mode_cmd.pitch);
+						 mode_cmd->pitch);
 		if (ret)
 			dev_err(rdev->dev, "FB failed to set tiling flags\n");
-	}
-	mutex_lock(&rdev->ddev->struct_mutex);
-	fb = radeon_framebuffer_create(rdev->ddev, &mode_cmd, gobj);
-	if (fb == NULL) {
-		DRM_ERROR("failed to allocate fb.\n");
-		ret = -ENOMEM;
-		goto out_unref;
+	}
 	ret = radeon_bo_reserve(rbo, false);
 	if (unlikely(ret != 0))
 		goto out_unref;
-	ret = radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_gpuaddr);
+	ret = radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, NULL);
 	if (ret) {
 		radeon_bo_unreserve(rbo);
 		goto out_unref;
+	}
 	if (fb_tiled)
 		radeon_bo_check_tiling(rbo, 0, 0);
-	ret = radeon_bo_kmap(rbo, &fbptr);
+	ret = radeon_bo_kmap(rbo, NULL);
 	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,
+			   struct drm_fb_helper_surface_size *sizes)
-    list_add(&fb->filp_head, &rdev->ddev->mode_config.fb_kernel_list);
+{
+	struct radeon_device *rdev = rfbdev->rdev;
+	struct fb_info *info;
-	*fb_p = fb;
+	struct drm_framebuffer *fb = NULL;
+	struct drm_mode_fb_cmd mode_cmd;
+	struct drm_gem_object *gobj = NULL;
+	struct radeon_bo *rbo = NULL;
+	struct device *device = &rdev->pdev->dev;
+	int ret;
+	unsigned long tmp;
+    ENTER();
+	mode_cmd.width = sizes->surface_width;
+	mode_cmd.height = sizes->surface_height;
+	/* avivo can't scanout real 24bpp */
+	if ((sizes->surface_bpp == 24) && ASIC_IS_AVIVO(rdev))
+		sizes->surface_bpp = 32;
+	mode_cmd.bpp = sizes->surface_bpp;
+	mode_cmd.depth = sizes->surface_depth;
-	rfb = to_radeon_framebuffer(fb);
+//   ret = radeonfb_create_pinned_object(rfbdev, &mode_cmd, &gobj);
-	rdev->fbdev_rfb = rfb;
+//   rbo = gobj->driver_private;
 	rdev->fbdev_rbo = rbo;
 	/* okay we have an object now allocate the framebuffer */
-	info = framebuffer_alloc(sizeof(struct radeon_fb_device), device);
+	info = framebuffer_alloc(0, device);
 	if (info == NULL) {
+		ret = -ENOMEM;
-		ret = -ENOMEM;
+		goto out_unref;
-		goto out_unref;
+	}
-	}
+	info->par = rfbdev;
-	rdev->fbdev_info = info;
+#if 0
-	rfbdev = info->par;
+	radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
-	rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+	fb = &rfbdev->rfb.base;
 	rfbdev->helper.dev = dev;
-	ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, rdev->num_crtc,
+	/* setup helper */
-					    RADEONFB_CONN_LIMIT);
+	rfbdev->helper.fb = fb;
-	if (ret)
+	rfbdev->helper.fbdev = info;
-		goto out_unref;
 //   memset_io(rbo->kptr, 0x0, radeon_bo_size(rbo));
 	strcpy(info->fix.id, "radeondrmfb");
 	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
+	info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
+	info->fbops = &radeonfb_ops;
+	tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start;
+	info->fix.smem_start = rdev->mc.aper_base + tmp;
-	info->flags = FBINFO_DEFAULT;
+	info->fix.smem_len = radeon_bo_size(rbo);
-	info->fbops = &radeonfb_ops;
+	info->screen_base = rbo->kptr;
-	tmp = fb_gpuaddr - rdev->mc.vram_start;
-	info->fix.smem_start = rdev->mc.aper_base + tmp;
+	info->screen_size = radeon_bo_size(rbo);
 	info->fix.smem_len = size;
-	info->screen_base = fbptr;
+	drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height);
 	info->screen_size = size;
 	/* setup aperture base/size for vesafb takeover */
+	info->apertures = alloc_apertures(1);
-	drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
+	if (!info->apertures) {
 		ret = -ENOMEM;
-	/* setup aperture base/size for vesafb takeover */
+		goto out_unref;
 	info->aperture_base = rdev->ddev->mode_config.fb_base;
-	info->aperture_size = rdev->mc.real_vram_size;
+	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
 	info->apertures->ranges[0].size = rdev->mc.aper_size;
-	info->fix.mmio_start = 0;
-	info->fix.mmio_len = 0;
+//   info->pixmap.size = 64*1024;
-//   info->pixmap.size = 64*1024;
+//   info->pixmap.buf_align = 8;
+//   info->pixmap.access_align = 32;
-//   info->pixmap.buf_align = 8;
+//   info->pixmap.flags = FB_PIXMAP_SYSTEM;
-//   info->pixmap.access_align = 32;
-//   info->pixmap.flags = FB_PIXMAP_SYSTEM;
-//   info->pixmap.scan_align = 1;
-	if (info->screen_base == NULL) {
+//   info->pixmap.scan_align = 1;
 		ret = -ENOSPC;
-		goto out_unref;
+	if (info->screen_base == NULL) {
-	}
-	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)size);
-	DRM_INFO("fb depth is %d\n", fb->depth);
+		ret = -ENOSPC;
-	DRM_INFO("   pitch is %d\n", fb->pitch);
+		goto out_unref;
+	}
-	fb->fbdev = info;
-	rfbdev->rfb = rfb;
-	rfbdev->rdev = rdev;
 	DRM_INFO("fb mappable at 0x%lX\n",  info->fix.smem_start);
-	mutex_unlock(&rdev->ddev->struct_mutex);
+	DRM_INFO("vram apper at 0x%lX\n",  (unsigned long)rdev->mc.aper_base);
-	return 0;
-out_unref:
-	if (rbo) {
+	DRM_INFO("size %lu\n", (unsigned long)radeon_bo_size(rbo));
-		ret = radeon_bo_reserve(rbo, false);
+	DRM_INFO("fb depth is %d\n", fb->depth);
+	DRM_INFO("   pitch is %d\n", fb->pitch);
+#endif
+    LEAVE();
+    return 0;
+out_unref:
+	if (rbo) {
+	}
+	if (fb && ret) {
+		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)
+{
+	struct fb_info *info;
+	struct radeon_framebuffer *rfb = &rfbdev->rfb;
+	if (rfbdev->helper.fbdev) {
+		info = rfbdev->helper.fbdev;
+//       unregister_framebuffer(info);
+//       framebuffer_release(info);
+	}
-		if (likely(ret == 0)) {
-			radeon_bo_kunmap(rbo);
+	if (rfb->obj) {
-			radeon_bo_unreserve(rbo);
+		radeonfb_destroy_pinned_object(rfb->obj);
 		rfb->obj = NULL;
+	}
+//   drm_fb_helper_fini(&rfbdev->helper);
+	drm_framebuffer_cleanup(&rfb->base);
-	if (fb && ret) {
+	return 0;
 		list_del(&fb->filp_head);
+static 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,
+};
+int radeon_fbdev_init(struct radeon_device *rdev)
-//      drm_gem_object_unreference(gobj);
+{
+	struct radeon_fbdev *rfbdev;
+	int bpp_sel = 32;
+	int ret;
+    ENTER();
 //       drm_framebuffer_cleanup(fb);
-		kfree(fb);
+	/* select 8 bpp console on RN50 or 16MB cards */
-	}
-//   drm_gem_object_unreference(gobj);
-   mutex_unlock(&rdev->ddev->struct_mutex);
+	if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
-out:
-	return ret;
-}
+		bpp_sel = 8;
-int radeonfb_probe(struct drm_device *dev)
-{
+	rfbdev = kzalloc(sizeof(struct radeon_fbdev), GFP_KERNEL);
-	struct radeon_device *rdev = dev->dev_private;
-	int bpp_sel = 32;
+	if (!rfbdev)
-	/* select 8 bpp console on RN50 or 16MB cards */
-	if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
-		bpp_sel = 8;
-	return drm_fb_helper_single_fb_probe(dev, 32, &radeonfb_create);
-}
-int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+		return -ENOMEM;
+	rfbdev->rdev = rdev;
+	rdev->mode_info.rfbdev = rfbdev;
+	rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+	ret = drm_fb_helper_init(rdev->ddev, &rfbdev->helper,
-{
+				 rdev->num_crtc,
-	struct fb_info *info;
+				 RADEONFB_CONN_LIMIT);
+	if (ret) {
-	struct radeon_framebuffer *rfb = to_radeon_framebuffer(fb);
+		kfree(rfbdev);
-	struct radeon_bo *rbo;
+		return ret;
+	}
+	drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
+	drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+    LEAVE();
-	int r;
+	return 0;
+}
+void radeon_fbdev_fini(struct radeon_device *rdev)
+{
+	if (!rdev->mode_info.rfbdev)
+		return;
-	if (!fb) {
-		return -EINVAL;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fb.c – Rev 1630 → 1963