From: Ben Skeggs Subject: Re: [PATCH] drm/nouveau: use ALIGN instead of open coding it Date: Thu, 25 Feb 2010 14:50:33 +1000 Message-ID: <1267073433.2848.2.camel@araqiel> References: <1267072030-23176-1-git-send-email-mattst88@gmail.com> Reply-To: bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1267072030-23176-1-git-send-email-mattst88-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Matt Turner Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org On Wed, 2010-02-24 at 23:27 -0500, Matt Turner wrote: > CC: Ben Skeggs > Signed-off-by: Matt Turner > --- > 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; >