Messages in this thread Patch in this message | | | Date | Sun, 21 Jun 2009 17:14:52 -0400 | Subject | Re: [git pull] drm: previous pull req + 1. | From | Andrew Lutomirski <> |
| |
On Sun, Jun 21, 2009 at 3:47 PM, Linus Torvalds<torvalds@linux-foundation.org> wrote: > > > What *has* changed is that we have a newradeon driver, and it looks like > that new radeon driver is crap, and does this: > > info->fix.smem_start = (unsigned long)fbptr; > > which is totally screwed up. It assigns a _virtual_ address to that > "smem_start" thing, even though it should be a physical one. > > I don't know the radeon driver, so I don't know where to find the physical > address. It's also possible that there is no good single physical > address, and the radeon driver should implement a "fb_mmap" function. > > Does this patch make the warning and the oops at least go away? Obviously > it won't result in a working frame buffer, but that's a separate issue >
I haven't tried your patch, but I hacked up the one below instead, which also fixes the oops. It still doesn't boot, though -- plymouth hangs (or otherwise dies), preventing my initramfs from finishing. The same kernel image boots fine with radeon.modeset=0.
I wouldn't apply this without someone more familiar with the code's ack -- I have no idea if the lifetime of the framebuffer object is right, and there may be any number of other bugs lurking in here. Not to mention a missing "static."
Signed-off-by: Andy Lutomirski <luto@mit.edu>
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index fa86d39..cbb330d 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -380,6 +380,12 @@ int radeonfb_blank(int blank, struct fb_info *info) return 0; }
+int radeonfb_mmap(struct fb_info *info, struct vm_area_struct *vma) +{ + struct radeon_fb_device *rfbdev = info->par; + return radeon_object_fbdev_mmap(rfbdev->rdev->fbdev_robj, vma); +} + static struct fb_ops radeonfb_ops = { .owner = THIS_MODULE, .fb_check_var = radeonfb_check_var, @@ -390,6 +396,7 @@ static struct fb_ops radeonfb_ops = { .fb_imageblit = cfb_imageblit, .fb_pan_display = radeonfb_pan_display, .fb_blank = radeonfb_blank, + .fb_mmap = radeonfb_mmap, };
/** @@ -499,7 +506,7 @@ int radeonfb_create(struct radeon_device *rdev,
ret = radeon_gem_object_create(rdev, aligned_size, 0, RADEON_GEM_DOMAIN_VRAM, - false, ttm_bo_type_kernel, + false, ttm_bo_type_device, false, &gobj); if (ret) { printk(KERN_ERR "failed to allocate framebuffer\n"); @@ -547,8 +554,6 @@ int radeonfb_create(struct radeon_device *rdev, info->fbops = &radeonfb_ops; info->fix.line_length = fb->pitch; info->screen_base = fbptr; - info->fix.smem_start = (unsigned long)fbptr; - info->fix.smem_len = size; info->screen_base = fbptr; info->screen_size = size; info->pseudo_palette = fb->pseudo_palette; diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 983e8df..433e52e 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -267,7 +267,6 @@ int radeon_object_pin(struct radeon_object *robj, uint32_t domain, } if (!r) { robj->rdev->fbdev_info->screen_base = fbptr; - robj->rdev->fbdev_info->fix.smem_start = (unsigned long)fbptr; } mutex_unlock(&robj->rdev->fbdev_info->lock); } @@ -316,7 +315,6 @@ void radeon_object_unpin(struct radeon_object *robj) } if (!r) { robj->rdev->fbdev_info->screen_base = fbptr; - robj->rdev->fbdev_info->fix.smem_start = (unsigned long)fbptr; } mutex_unlock(&robj->rdev->fbdev_info->lock); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |