---

yaml --- r: 345189 b: refs/heads/master c: 4d8d71b h: refs/heads/master i: 345187: f99bd65 v: v3
git-mirror · Oct 26, 2012 · 9f80589 · 9f80589
1 parent cc831a6
commit 9f80589
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: fbfcc4f3a0cf8bbde87646b74241faa8e37426bf
+refs/heads/master: 4d8d71b5ddc43d51121f72ad83825afd28493516
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -692,7 +692,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe)
 		break;
 
 	case 7:
-		if (IS_HASWELL(dev))
+		if (IS_HASWELL(dev) || IS_VALLEYVIEW(dev))
 			intel_plane->can_scale = false;
 		else
 			intel_plane->can_scale = true;