← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/radeon_fb.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_fb.c
64
64
};
65
65
 
66
66
 
67
 
static int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
 
67
int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
68
68
{
69
69
        int aligned = width;
70
70
        int align_large = (ASIC_IS_AVIVO(rdev)) || tiled;
90
90
 
91
91
static void radeonfb_destroy_pinned_object(struct drm_gem_object *gobj)
92
92
{
93
 
        struct radeon_bo *rbo = gobj->driver_private;
 
93
        struct radeon_bo *rbo = gem_to_radeon_bo(gobj);
94
94
        int ret;
95
95
 
96
96
        ret = radeon_bo_reserve(rbo, false);
131
131
                       aligned_size);
132
132
                return -ENOMEM;
133
133
        }
134
 
        rbo = gobj->driver_private;
 
134
        rbo = gem_to_radeon_bo(gobj);
135
135
 
136
136
        if (fb_tiled)
137
137
                tiling_flags = RADEON_TILING_MACRO;
205
205
        mode_cmd.depth = sizes->surface_depth;
206
206
 
207
207
        ret = radeonfb_create_pinned_object(rfbdev, &mode_cmd, &gobj);
208
 
        rbo = gobj->driver_private;
 
208
        rbo = gem_to_radeon_bo(gobj);
209
209
 
210
210
        /* okay we have an object now allocate the framebuffer */
211
211
        info = framebuffer_alloc(0, device);
406
406
        struct radeon_bo *robj;
407
407
        int size = 0;
408
408
 
409
 
        robj = rdev->mode_info.rfbdev->rfb.obj->driver_private;
 
409
        robj = gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj);
410
410
        size += radeon_bo_size(robj);
411
411
        return size;
412
412
}
413
413
 
414
414
bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
415
415
{
416
 
        if (robj == rdev->mode_info.rfbdev->rfb.obj->driver_private)
 
416
        if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.obj))
417
417
                return true;
418
418
        return false;
419
419
}