---

yaml --- r: 318635 b: refs/heads/master c: f4d7105 h: refs/heads/master i: 318633: 5065e05 318631: a47ff6a v: v3
git-mirror · Jun 27, 2012 · 39de22a · 39de22a
1 parent 8b2a299
commit 39de22a
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: e86fe0d31722090e3bb72a3e8aab70f07e2c6b77
+refs/heads/master: f4d71056482f0c3306aa752fd626883f60deed96
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -85,7 +85,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 		break;
 	default:
 		DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
-		sprctl |= DVS_FORMAT_RGBX888;
+		sprctl |= SPRITE_FORMAT_RGBX888;
 		pixel_size = 4;
 		break;
 	}