Skip to contentSkip to conversation

drm/vmwgfx: use ALIGN instead of open coding it

PATCH New Matt Turner 1 participant 1 message Feb 25, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/vmwgfx: use ALIGN instead of open coding it

CC Jakob Bornecrantz <[email protected]>
---
 drivers/gpu/drm/vmwgfx/svga_overlay.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/vmwgfx/svga_overlay.h +4 -4
index f753d73..55b7627 100644
@@ -143,7 +143,7 @@ VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
 {
     int tmp;
 
-    *width = (*width + 1) & ~1;
+    *width = ALIGN(*width, 2)
 
     if (offsets) {
         offsets[0] = 0;
@@ -151,8 +151,8 @@ VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
 
     switch (format) {
     case VMWARE_FOURCC_YV12:
-       *height = (*height + 1) & ~1;
-       *size = (*width + 3) & ~3;
+       *height = ALIGN(*height, 2);
+       *size = ALIGN(*width, 4);
 
        if (pitches) {
           pitches[0] = *size;
@@ -164,7 +164,7 @@ VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
           offsets[1] = *size;
        }
 
-       tmp = ((*width >> 1) + 3) & ~3;
+       tmp = ALIGN(*width >> 1, 4);
 
        if (pitches) {
           pitches[1] = pitches[2] = tmp;
Signature · 10 lines
1.6.4.4


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--