Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1429 → Rev 1430

/drivers/video/drm/radeon/radeon_fb.c
147,7 → 147,7
struct drm_mode_fb_cmd mode_cmd;
struct drm_gem_object *gobj = NULL;
struct radeon_bo *rbo = NULL;
// struct device *device = &rdev->pdev->dev;
struct device *device = &rdev->pdev->dev;
int size, aligned_size, ret;
u64 fb_gpuaddr;
void *fbptr = NULL;
154,7 → 154,6
unsigned long tmp;
bool fb_tiled = false; /* useful for testing */
u32 tiling_flags = 0;
int crtc_count;
 
mode_cmd.width = surface_width;
mode_cmd.height = surface_height;
235,7 → 234,7
rdev->fbdev_rfb = rfb;
rdev->fbdev_rbo = rbo;
 
info = framebuffer_alloc(sizeof(struct radeon_fb_device), NULL);
info = framebuffer_alloc(sizeof(struct radeon_fb_device), device);
if (info == NULL) {
ret = -ENOMEM;
goto out_unref;
245,11 → 244,7
rfbdev = info->par;
rfbdev->helper.funcs = &radeon_fb_helper_funcs;
rfbdev->helper.dev = dev;
if (rdev->flags & RADEON_SINGLE_CRTC)
crtc_count = 1;
else
crtc_count = 2;
ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, crtc_count,
ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, rdev->num_crtc,
RADEONFB_CONN_LIMIT);
if (ret)
goto out_unref;
262,7 → 257,7
info->flags = FBINFO_DEFAULT;
info->fbops = &radeonfb_ops;
 
tmp = fb_gpuaddr - rdev->mc.vram_location;
tmp = fb_gpuaddr - rdev->mc.vram_start;
info->fix.smem_start = rdev->mc.aper_base + tmp;
info->fix.smem_len = size;
info->screen_base = fbptr;
362,6 → 357,4
return 0;
}
EXPORT_SYMBOL(radeonfb_remove);
 
 
 
MODULE_LICENSE("GPL");