---

yaml --- r: 298531 b: refs/heads/master c: b4db1e3 h: refs/heads/master i: 298529: 24456de 298527: 1b8de4a v: v3
git-mirror · Apr 3, 2012 · 8c0344d · 8c0344d
1 parent ed35e4c
commit 8c0344d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97effadb65ed08809e1720c8d3ee80b73a93665c
+refs/heads/master: b4db1e35ac59c144965f517bc575a0d75b60b03f
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -411,6 +411,9 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
 
 	old_obj = intel_plane->obj;
 
+	src_w = src_w >> 16;
+	src_h = src_h >> 16;
+
 	/* Pipe must be running... */
 	if (!(I915_READ(PIPECONF(pipe)) & PIPECONF_ENABLE))
 		return -EINVAL;