Matt Turner
2010-Feb-25 04:27 UTC
[Nouveau] [PATCH] drm/nouveau: use ALIGN instead of open coding it
CC: Ben Skeggs <bskeggs at redhat.com> Signed-off-by: Matt Turner <mattst88 at gmail.com> --- drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nv50_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index fd01caa..3da90c2 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c @@ -118,7 +118,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) return; } - width = (image->width + 31) & ~31; + width = ALIGN(image->width, 32); dsize = (width * image->height) >> 5; if (info->fix.visual == FB_VISUAL_TRUECOLOR || diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c index 0f57cdf..993c712 100644 --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c @@ -109,7 +109,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) return; } - width = (image->width + 31) & ~31; + width = ALIGN(image->width, 32); dwords = (width * image->height) >> 5; BEGIN_RING(chan, NvSub2D, 0x0814, 2); diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 94400f7..a8a639e 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -373,7 +373,7 @@ nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, if (gpuobj->im_backing) return -EINVAL; - *sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1); + *sz = ALIGN(*sz, NV50_INSTMEM_PAGE_SIZE); if (*sz == 0) return -EINVAL; -- 1.6.4.4
Ben Skeggs
2010-Feb-25 04:50 UTC
[Nouveau] [PATCH] drm/nouveau: use ALIGN instead of open coding it
On Wed, 2010-02-24 at 23:27 -0500, Matt Turner wrote:> CC: Ben Skeggs <bskeggs at redhat.com> > Signed-off-by: Matt Turner <mattst88 at gmail.com> > --- > drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- > drivers/gpu/drm/nouveau/nv50_fbcon.c | 2 +- > drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-)Thank you, in nouveau git. Ben.> > diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c > index fd01caa..3da90c2 100644 > --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c > +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c > @@ -118,7 +118,7 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) > return; > } > > - width = (image->width + 31) & ~31; > + width = ALIGN(image->width, 32); > dsize = (width * image->height) >> 5; > > if (info->fix.visual == FB_VISUAL_TRUECOLOR || > diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c > index 0f57cdf..993c712 100644 > --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c > +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c > @@ -109,7 +109,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) > return; > } > > - width = (image->width + 31) & ~31; > + width = ALIGN(image->width, 32); > dwords = (width * image->height) >> 5; > > BEGIN_RING(chan, NvSub2D, 0x0814, 2); > diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c > index 94400f7..a8a639e 100644 > --- a/drivers/gpu/drm/nouveau/nv50_instmem.c > +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c > @@ -373,7 +373,7 @@ nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, > if (gpuobj->im_backing) > return -EINVAL; > > - *sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1); > + *sz = ALIGN(*sz, NV50_INSTMEM_PAGE_SIZE); > if (*sz == 0) > return -EINVAL; >