[linux-yocto] [yocto-4.12][PATCH 12/36] drm/i915/cnl: Cannonlake has 4 planes (3 sprites) per pipe

[Liwei Song]

From: James Irwin <james.irwin at intel.com>

commit 8366be98f6792419ac2e19648391988edec7a7fe upstream.

Issue: VIZ-4525

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>
Signed-off-by: James Irwin <james.irwin at intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2 at gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1496781040-20888-6-git-send-email-rodrigo.vivi@intel.com
Signed-off-by: Liwei Song <liwei.song.lsong at gmail.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 6b09a82468ef..3cc8cdbc54ff 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -328,7 +328,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 	 * we don't expose the topmost plane at all to prevent ABI breakage
 	 * down the line.
 	 */
-	if (IS_GEMINILAKE(dev_priv))
+	if (IS_GEN10(dev_priv) || IS_GEMINILAKE(dev_priv))
 		for_each_pipe(dev_priv, pipe)
 			info->num_sprites[pipe] = 3;
 	else if (IS_BROXTON(dev_priv)) {
-- 
2.7.4