From 413f3c19f8ecefd29067897db9c414a29d86685f Mon Sep 17 00:00:00 2001

From: Rodrigo Vivi <rodrigo.vivi@intel.com>

Date: Tue, 6 Jun 2017 13:30:30 -0700

Subject: [PATCH] drm/i915/cnl: Introduce Cannonlake platform defition.

Mime-version: 1.0

Content-type: text/plain; charset=UTF-8

Content-transfer-encoding: 8bit

Git-commit: 413f3c19f8ecefd29067897db9c414a29d86685f

Patch-mainline: v4.13-rc1

References: FATE#322643 bsc#1055900

Cannonlake is a Intel® Processor containing Intel® HD Graphics

following Kabylake.

It is Gen10.

Let's start by adding the platform definition based on previous

platforms but yet as alpha_support.

On following patches we will start adding PCI IDs and the

platform specific changes.

CNL has an increased DDB size as Damien had previously

noticed and provided a separated patch that got squashed here.

V2: Squash DDB size here per Ander request.

Credits-to: Damien Lespiau <damien.lespiau@intel.com>

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>

Link: http://patchwork.freedesktop.org/patch/msgid/1496781040-20888-1-git-send-email-rodrigo.vivi@intel.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/i915/i915_drv.h          |    3 +++

 drivers/gpu/drm/i915/i915_pci.c          |    8 ++++++++

 drivers/gpu/drm/i915/intel_device_info.c |    1 +

 3 files changed, 12 insertions(+)

--- a/drivers/gpu/drm/i915/i915_drv.h

+++ b/drivers/gpu/drm/i915/i915_drv.h

@@ -826,6 +826,7 @@ enum intel_platform {

 	INTEL_BROXTON,

 	INTEL_KABYLAKE,

 	INTEL_GEMINILAKE,

+	INTEL_CANNONLAKE,

 	INTEL_MAX_PLATFORMS

 };

@@ -2768,6 +2769,7 @@ intel_info(const struct drm_i915_private

 #define IS_BROXTON(dev_priv)	((dev_priv)->info.platform == INTEL_BROXTON)

 #define IS_KABYLAKE(dev_priv)	((dev_priv)->info.platform == INTEL_KABYLAKE)

 #define IS_GEMINILAKE(dev_priv)	((dev_priv)->info.platform == INTEL_GEMINILAKE)

+#define IS_CANNONLAKE(dev_priv)	((dev_priv)->info.platform == INTEL_CANNONLAKE)

 #define IS_MOBILE(dev_priv)	((dev_priv)->info.is_mobile)

 #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \

 				    (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)

@@ -2859,6 +2861,7 @@ intel_info(const struct drm_i915_private

 #define IS_GEN7(dev_priv)	(!!((dev_priv)->info.gen_mask & BIT(6)))

 #define IS_GEN8(dev_priv)	(!!((dev_priv)->info.gen_mask & BIT(7)))

 #define IS_GEN9(dev_priv)	(!!((dev_priv)->info.gen_mask & BIT(8)))

+#define IS_GEN10(dev_priv)	(!!((dev_priv)->info.gen_mask & BIT(9)))

 #define IS_LP(dev_priv)	(INTEL_INFO(dev_priv)->is_lp)

 #define IS_GEN9_LP(dev_priv)	(IS_GEN9(dev_priv) && IS_LP(dev_priv))

--- a/drivers/gpu/drm/i915/i915_pci.c

+++ b/drivers/gpu/drm/i915/i915_pci.c

@@ -425,6 +425,14 @@ static const struct intel_device_info in

 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,

 };

+static const struct intel_device_info intel_cannonlake_info = {

+	BDW_FEATURES,

+	.is_alpha_support = 1,

+	.platform = INTEL_CANNONLAKE,

+	.gen = 10,

+	.ddb_size = 1024,

+};

+

 /*

  * Make sure any device matches here are from most specific to most

  * general.  For example, since the Quanta match is based on the subsystem

--- a/drivers/gpu/drm/i915/intel_device_info.c

+++ b/drivers/gpu/drm/i915/intel_device_info.c

@@ -51,6 +51,7 @@ static const char * const platform_names

 	PLATFORM_NAME(BROXTON),

 	PLATFORM_NAME(KABYLAKE),

 	PLATFORM_NAME(GEMINILAKE),

+	PLATFORM_NAME(CANNONLAKE),

 };

 #undef PLATFORM_NAME