From 9f80589c9fc05bad3b48725635b09bb1cfafaa2c Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Thu, 25 Oct 2012 18:06:19 +0100
Subject: [PATCH] --- yaml --- r: 345189 b: refs/heads/master c:
 4d8d71b5ddc43d51121f72ad83825afd28493516 h: refs/heads/master i:   345187:
 f99bd6554effd1d95b62fce50dc35643a3799f3a v: v3

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

diff --git a/[refs] b/[refs]
index 277662059102..3506938ba9ff 100644
--- 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
index 176c46225f90..e69035d40aee 100644
--- 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;