---

yaml --- r: 242317 b: refs/heads/master c: ed0291f h: refs/heads/master i: 242315: 98b6aef v: v3
git-mirror · Mar 23, 2011 · 8f6ae2a · 8f6ae2a
1 parent 23e504a
commit 8f6ae2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e281fcaa287fb39ce26d9aa33a716c2a7bb8484e
+refs/heads/master: ed0291fd16f6349ef43d3f25a4626c2f7baf568b
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -224,7 +224,7 @@ i915_gem_dumb_create(struct drm_file *file,
 		     struct drm_mode_create_dumb *args)
 {
 	/* have to work out size/pitch and return them */
-	args->pitch = ALIGN(args->width & ((args->bpp + 1) / 8), 64);
+	args->pitch = ALIGN(args->width * ((args->bpp + 7) / 8), 64);
 	args->size = args->pitch * args->height;
 	return i915_gem_create(file, dev,
 			       args->size, &args->handle);