diff options
| author |   Maarten Maathuis <madman2003@gmail.com> | 2009-12-25 18:51:17 +0100 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2010-01-11 09:06:36 +1000 |
| commit | 1c7059e4f36e76c72cefbb6c9bd2bcf45c12e777 (patch) | |
| tree | 3bf415ce10c2f5760cb73f2a6a69480f6a71eee1 /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
| parent | drm/nouveau: Don't skip card take down on nv0x. (diff) | |
| download | linux-dev-1c7059e4f36e76c72cefbb6c9bd2bcf45c12e777.tar.xz linux-dev-1c7059e4f36e76c72cefbb6c9bd2bcf45c12e777.zip | |
drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
- Aligning to block size should ensure that the extra size is enough.
- Using roundup, because not all sizes are powers of two.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 84af25c238b6..44cbbeeb7745 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -212,11 +212,11 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width, mode_cmd.bpp = surface_bpp; mode_cmd.pitch = mode_cmd.width * (mode_cmd.bpp >> 3); - mode_cmd.pitch = ALIGN(mode_cmd.pitch, 256); + mode_cmd.pitch = roundup(mode_cmd.pitch, 256); mode_cmd.depth = surface_depth; size = mode_cmd.pitch * mode_cmd.height; - size = ALIGN(size, PAGE_SIZE); + size = roundup(size, PAGE_SIZE); ret = nouveau_gem_new(dev, dev_priv->channel, size, 0, TTM_PL_FLAG_VRAM, 0, 0x0000, false, true, &nvbo); |