UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: use ALIGN instead of open coding it 

CC: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Matt Turner 2010-02-24 23:27:10 -05:00 committed by Ben Skeggs
parent b30083bdb9
commit 3bfc7d22d0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nv04_fbcon.c
View File

@ -118,7 +118,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
return; return;
} }
width = (image->width + 31) & ~31; width = ALIGN(image->width, 32);
dsize = (width * image->height) >> 5; dsize = (width * image->height) >> 5;
if (info->fix.visual == FB_VISUAL_TRUECOLOR || if (info->fix.visual == FB_VISUAL_TRUECOLOR ||

2
drivers/gpu/drm/nouveau/nv50_fbcon.c
View File

@ -109,7 +109,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
return; return;
} }
width = (image->width + 31) & ~31; width = ALIGN(image->width, 32);
dwords = (width * image->height) >> 5; dwords = (width * image->height) >> 5;
BEGIN_RING(chan, NvSub2D, 0x0814, 2); BEGIN_RING(chan, NvSub2D, 0x0814, 2);

2
drivers/gpu/drm/nouveau/nv50_instmem.c
View File

@ -390,7 +390,7 @@ nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj,
if (gpuobj->im_backing) if (gpuobj->im_backing)
return -EINVAL; return -EINVAL;
*sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1); *sz = ALIGN(*sz, NV50_INSTMEM_PAGE_SIZE);
if (*sz == 0) if (*sz == 0)
return -EINVAL; return -EINVAL;