diff options
| author | Dave Airlie | 2011-02-18 06:51:57 +0100 |
|---|---|---|
| committer | Dave Airlie | 2011-02-23 01:08:17 +0100 |
| commit | e40b6fc8373314666e7853733dc0ca4049a68b95 (patch) | |
| tree | 2bd19fb034d4973e70eaafee431f124302252197 | |
| parent | Revert "drm/radeon/kms: switch back to min->max pll post divider iteration" (diff) | |
| download | kernel-qcow2-linux-e40b6fc8373314666e7853733dc0ca4049a68b95.tar.gz kernel-qcow2-linux-e40b6fc8373314666e7853733dc0ca4049a68b95.tar.xz kernel-qcow2-linux-e40b6fc8373314666e7853733dc0ca4049a68b95.zip | |
drm/radeon/kms: align height of fb allocation.
this aligns the height of the fb allocation so it doesn't trip
over the size checks later when we use this from userspace to
copy the buffer at X start.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 66324b5bb5ba..cc44bdfec80f 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -113,11 +113,14 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, u32 tiling_flags = 0; int ret; int aligned_size, size; + int height = mode_cmd->height; /* 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; + if (rdev->family >= CHIP_R600) + height = ALIGN(mode_cmd->height, 8); + size = mode_cmd->pitch * height; aligned_size = ALIGN(size, PAGE_SIZE); ret = radeon_gem_object_create(rdev, aligned_size, 0, RADEON_GEM_DOMAIN_VRAM, |