drm/nvc0-/gr: bug widening a binary "not" operation

PATCH New Dan Carpenter 1 participant 1 message May 15, 2013

Subsystems (4)

DRM drivers DRM misc Kernel janitors nouveau

lore

Share & tools

lore

Dan Carpenter

author

2013-05-15 07:12 UTC #0 lore raw

PATCH 1/1 drm/nvc0-/gr: bug widening a binary "not" operation

"align" is u32 but info->addr and info->buffer[info->buffer_nr] are u64. The "&= ~(align - 1)" operation clears the high bits accidentally. I have fixed this by using the ALIGN() macro.

Signed-off-by Dan Carpenter <[email protected]>

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c +1 -3

index 4cc6269..44b620b 100644
@@ -117,9 +117,7 @@ nvc0_grctx_init(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 void
 nvc0_grctx_data(struct nvc0_grctx *info, u32 size, u32 align, u32 access)
 {
-	info->buffer[info->buffer_nr]  = info->addr;
-	info->buffer[info->buffer_nr] +=  (align - 1);
-	info->buffer[info->buffer_nr] &= ~(align - 1);
+	info->buffer[info->buffer_nr] = ALIGN(info->addr, align);
 	info->addr = info->buffer[info->buffer_nr++] + size;
 
 	info->data->size = size;