From 8f6ae2a48edcd6b103c752d55162ab5303ec30fc Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 19 Mar 2011 08:21:45 +0000
Subject: [PATCH] --- yaml --- r: 242317 b: refs/heads/master c:
 ed0291fd16f6349ef43d3f25a4626c2f7baf568b h: refs/heads/master i:   242315:
 98b6aefb7d7502453b06e7b65bc3c77036e37492 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0aa8a5ac0a86..e87975bb29ca 100644
--- 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
index c5dfb59e13d3..0b99c30bb19c 100644
--- 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);