[Intel-gfx] [PATCH 2/9] drm/i915/ehl: Add ElkhartLake platform

[Lucas De Marchi]

On Wed, Mar 13, 2019 at 02:11:37PM -0700, Rodrigo Vivi wrote:
>From: Bob Paauwe <bob.j.paauwe at intel.com>
>
>Add ElkhartLake as a unique platform as there are some differences
>between it and Icelake.
>
>Signed-off-by: Bob Paauwe <bob.j.paauwe at intel.com>
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/i915/i915_drv.h          | 1 +
> drivers/gpu/drm/i915/i915_pci.c          | 2 +-
> drivers/gpu/drm/i915/intel_device_info.c | 1 +
> drivers/gpu/drm/i915/intel_device_info.h | 1 +
> 4 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 0ed6e871f609..5c61f9d0dfad 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -2314,6 +2314,7 @@ static inline unsigned int i915_sg_segment_size(void)
> #define IS_COFFEELAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)
> #define IS_CANNONLAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_CANNONLAKE)
> #define IS_ICELAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_ICELAKE)
>+#define IS_ELKHARTLAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)
> #define IS_MOBILE(dev_priv)	(INTEL_INFO(dev_priv)->is_mobile)
> #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
> 				    (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>index d4d3a904950c..6b36bb0e5e0b 100644
>--- a/drivers/gpu/drm/i915/i915_pci.c
>+++ b/drivers/gpu/drm/i915/i915_pci.c
>@@ -726,7 +726,7 @@ static const struct intel_device_info intel_icelake_11_info = {
>
> static const struct intel_device_info intel_elkhartlake_info = {
> 	GEN11_FEATURES,
>-	PLATFORM(INTEL_ICELAKE),
>+	PLATFORM(INTEL_ELKHARTLAKE),
> 	.num_pipes = 3,
> 	.is_alpha_support = 1,
> 	.engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0),
>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>index aac19b1c419c..c8c0f4134bdb 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.c
>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>@@ -57,6 +57,7 @@ static const char * const platform_names[] = {
> 	PLATFORM_NAME(COFFEELAKE),
> 	PLATFORM_NAME(CANNONLAKE),
> 	PLATFORM_NAME(ICELAKE),
>+	PLATFORM_NAME(ELKHARTLAKE),
> };
> #undef PLATFORM_NAME
>
>diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>index 047d10bdd455..f7b174e7ba82 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.h
>+++ b/drivers/gpu/drm/i915/intel_device_info.h
>@@ -73,6 +73,7 @@ enum intel_platform {
> 	INTEL_CANNONLAKE,
> 	/* gen11 */
> 	INTEL_ICELAKE,
>+	INTEL_ELKHARTLAKE,
> 	INTEL_MAX_PLATFORMS
> };
>
>-- 
>2.20.1
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx