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

 #include "drm_fb_helper.h"
 #include
 #include "radeon_object.h"
-struct fb_info *framebuffer_alloc(size_t size);
+struct fb_info *framebuffer_alloc(size_t size, void *dev);
 struct radeon_fb_device {
 //	.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,
 };
 /**
  * Curretly it is assumed that the old framebuffer is reused.
 	return aligned;
+}
 static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
+	.gamma_set = radeon_crtc_fb_gamma_set,
-	.gamma_set = radeon_crtc_fb_gamma_set,
+	.gamma_get = radeon_crtc_fb_gamma_get,
 };
 int radeonfb_create(struct drm_device *dev,
+		    uint32_t fb_width, uint32_t fb_height,
-		    uint32_t fb_width, uint32_t fb_height,
+		    uint32_t surface_width, uint32_t surface_height,
-		    uint32_t surface_width, uint32_t surface_height,
+		    uint32_t surface_depth, uint32_t surface_bpp,
 		    struct drm_framebuffer **fb_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 drm_gem_object *gobj = NULL;
 	struct radeon_object *robj = NULL;
-//   struct device *device = &rdev->pdev->dev;
+    void   *device = NULL; //&rdev->pdev->dev;
 	int size, aligned_size, ret;
 	u64 fb_gpuaddr;
 	void *fbptr = NULL;
 	unsigned long tmp;
+	bool fb_tiled = false; /* useful for testing */
-	bool fb_tiled = false; /* useful for testing */
+	u32 tiling_flags = 0;
-	u32 tiling_flags = 0;
+	int crtc_count;
+    mode_cmd.width  = surface_width;
+	mode_cmd.height = surface_height;
+	/* avivo can't scanout real 24bpp */
 	if ((surface_bpp == 24) && ASIC_IS_AVIVO(rdev))
-    mode_cmd.width  = surface_width;
+		surface_bpp = 32;
 	mode_cmd.height = surface_height;
 	mode_cmd.bpp = 32;
 	/* 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);
-	mode_cmd.depth = 24;
+	mode_cmd.depth = surface_depth;
 	size = mode_cmd.pitch * mode_cmd.height;
 	aligned_size = ALIGN(size, PAGE_SIZE);
     ret = radeon_gem_fb_object_create(rdev, aligned_size, 0,
-			RADEON_GEM_DOMAIN_VRAM,
+    ret = radeon_gem_fb_object_create(rdev, aligned_size, 0,
-            false, 0,
+			RADEON_GEM_DOMAIN_VRAM,
-			false, &gobj);
+            false, 0,
 			false, &gobj);
 	*fb_p = fb;
 	rfb = to_radeon_framebuffer(fb);
 	rdev->fbdev_rfb = rfb;
 	rdev->fbdev_robj = robj;
-	info = framebuffer_alloc(sizeof(struct radeon_fb_device));
+	info = framebuffer_alloc(sizeof(struct radeon_fb_device), device);
 	if (info == NULL) {
 		ret = -ENOMEM;
 		goto out_unref;
+	}
 	rdev->fbdev_info = info;
 	rfbdev = info->par;
+	rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+	rfbdev->helper.dev = dev;
+	if (rdev->flags & RADEON_SINGLE_CRTC)
+		crtc_count = 1;
-	rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+	else
-	rfbdev->helper.dev = dev;
+		crtc_count = 2;
-	ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, 2,
+	ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, crtc_count,
 					    RADEONFB_CONN_LIMIT);
 	if (ret)
     fbptr = (void*)0xFE000000; // LFB_BASE
 	strcpy(info->fix.id, "radeondrmfb");
-	drm_fb_helper_fill_fix(info, fb->pitch);
+	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
 	return ret;
+}
 int radeonfb_probe(struct drm_device *dev)
-{
-	int ret;
+{
-	ret = drm_fb_helper_single_fb_probe(dev, &radeonfb_create);
-	return ret;
+	return drm_fb_helper_single_fb_probe(dev, 32, &radeonfb_create);
-}
 EXPORT_SYMBOL(radeonfb_probe);
 int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+{
     *obj = gobj;
     return 0;
+}
-struct fb_info *framebuffer_alloc(size_t size)
+struct fb_info *framebuffer_alloc(size_t size, void *dev)
+{
 #define BYTES_PER_LONG (BITS_PER_LONG/8)
 #define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG))
+{
     struct drm_connector *connector;
+    bool ret = false;
-    bool ret = false;
+    ENTER();
     list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+    {
         crtc = encoder->crtc;
         if(crtc == NULL)
             continue;
 /*
         list_for_each_entry(mode, &connector->modes, head)
+        {
             if (mode->type & DRM_MODE_TYPE_PREFERRED);
-                break;
-        };
+                break;
         };
 /*
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
                 else
+                {
                     DRM_ERROR("failed to set mode %d_%d on crtc %p\n",
                                fb->width, fb->height, crtc);
                 };
+                LEAVE();
+                return ret;
             };
+        }
     };
+    LEAVE();
     return ret;
 };

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fb.c – Rev 1182 → 1221