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

 /*
  * Copyright © 2007 David Airlie
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
  * Authors:
  *     David Airlie
  */
 #include
+#include
 #include
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 #include "radeon_drm.h"
 #include "radeon.h"
 #include "drm_fb_helper.h"
 #include
 #include "radeon_object.h"
+int radeonfb_create_object(struct radeon_fbdev *rfbdev,
+                     struct drm_mode_fb_cmd *mode_cmd,
+                     struct drm_gem_object **gobj_p);
 /* 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 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,
 	.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,
 };
 int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
+{
 	int aligned = width;
 	int align_large = (ASIC_IS_AVIVO(rdev)) || tiled;
 	int pitch_mask = 0;
 	switch (bpp / 8) {
 	case 1:
 		pitch_mask = align_large ? 255 : 127;
 		break;
 	case 2:
 		pitch_mask = align_large ? 127 : 31;
 		break;
 	case 3:
 	case 4:
 		pitch_mask = align_large ? 63 : 15;
 		break;
+	}
 	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;
-	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_cmd *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;
-	/* 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);
-	size = mode_cmd->pitch * mode_cmd->height;
-	aligned_size = ALIGN(size, PAGE_SIZE);
-//   ret = radeon_gem_object_create(rdev, aligned_size, 0,
-//           RADEON_GEM_DOMAIN_VRAM,
-//                      false, true,
-//           &gobj);
-	if (ret) {
-		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",
-		       aligned_size);
-		return -ENOMEM;
-	}
-	rbo = gobj->driver_private;
-	if (fb_tiled)
-		tiling_flags = RADEON_TILING_MACRO;
-#ifdef __BIG_ENDIAN
-	switch (mode_cmd->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->pitch);
-		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;
-	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, 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)
+{
 	struct radeon_device *rdev = rfbdev->rdev;
 	struct fb_info *info;
 	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;
-//   ret = radeonfb_create_pinned_object(rfbdev, &mode_cmd, &gobj);
+    ret = radeonfb_create_object(rfbdev, &mode_cmd, &gobj);
-//   rbo = gobj->driver_private;
+	rbo = gem_to_radeon_bo(gobj);
 	/* okay we have an object now allocate the framebuffer */
 	info = framebuffer_alloc(0, device);
 	if (info == NULL) {
 		ret = -ENOMEM;
 		goto out_unref;
+	}
 	info->par = rfbdev;
 #if 0
 	radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
 	fb = &rfbdev->rfb.base;
 	/* setup helper */
 	rfbdev->helper.fb = fb;
 	rfbdev->helper.fbdev = info;
 //   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->fix.smem_len = radeon_bo_size(rbo);
 	info->screen_base = rbo->kptr;
 	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;
+	}
 	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
 	info->apertures->ranges[0].size = rdev->mc.aper_size;
 //   info->pixmap.size = 64*1024;
 //   info->pixmap.buf_align = 8;
 //   info->pixmap.access_align = 32;
 //   info->pixmap.flags = FB_PIXMAP_SYSTEM;
 //   info->pixmap.scan_align = 1;
 	if (info->screen_base == NULL) {
 		ret = -ENOSPC;
 		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->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 (rfb->obj) {
-		radeonfb_destroy_pinned_object(rfb->obj);
 		rfb->obj = NULL;
+	}
 //   drm_fb_helper_fini(&rfbdev->helper);
 	drm_framebuffer_cleanup(&rfb->base);
 	return 0;
+}
 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,
 };
+extern struct radeon_fbdev *kos_rfbdev;
 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))
 		bpp_sel = 8;
 	rfbdev = kzalloc(sizeof(struct radeon_fbdev), GFP_KERNEL);
 	if (!rfbdev)
 		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,
 				 RADEONFB_CONN_LIMIT);
 	if (ret) {
 		kfree(rfbdev);
 		return ret;
+	}
 	drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
 	drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+    kos_rfbdev = rfbdev;
     LEAVE();
 	return 0;
+}
 void radeon_fbdev_fini(struct radeon_device *rdev)
+{
 	if (!rdev->mode_info.rfbdev)
 		return;
 	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 = rdev->mode_info.rfbdev->rfb.obj->driver_private;
+	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 == rdev->mode_info.rfbdev->rfb.obj->driver_private)
+	if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj))
 		return true;
 	return false;
+}

Subversion Repositories Kolibri OS

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