[2/2] drm/i915/cml: Introduce Comet Lake PCH

Submitted by Srivatsa, Anusha on March 14, 2019, 6:29 p.m.

Details

Message ID 20190314182918.15435-2-anusha.srivatsa@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Srivatsa, Anusha March 14, 2019, 6:29 p.m.
From: Anusha Srivatsa <anusha.srivatsa@intel.com>

Comet Lake PCH is based off of Cannon Point(CNP).
Add PCI ID for Comet Lake PCH.

v2: Code cleanup (DK)

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 5 +++++
 drivers/gpu/drm/i915/i915_drv.h | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0d743907e7bc..b519c3685e80 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -188,6 +188,11 @@  intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 		DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
 		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
 		return PCH_CNP;
+	case INTEL_PCH_CMP_DEVICE_ID_TYPE:
+		DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
+		WARN_ON(!IS_COFFEELAKE(dev_priv));
+		/* CML has same South Display Engine from CNP */
+		return PCH_CNP;
 	case INTEL_PCH_ICP_DEVICE_ID_TYPE:
 		DRM_DEBUG_KMS("Found Ice Lake PCH\n");
 		WARN_ON(!IS_ICELAKE(dev_priv));
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index dccb6006aabf..4090462f591a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -537,7 +537,7 @@  enum intel_pch {
 	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
 	PCH_SPT,        /* Sunrisepoint PCH */
 	PCH_KBP,        /* Kaby Lake PCH */
-	PCH_CNP,        /* Cannon Lake PCH */
+	PCH_CNP,        /* Cannon/Comet Lake PCH */
 	PCH_ICP,	/* Ice Lake PCH */
 };
 
@@ -2549,6 +2549,7 @@  static inline unsigned int i915_sg_segment_size(void)
 #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
 #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
 #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE		0x9D80
+#define INTEL_PCH_CMP_DEVICE_ID_TYPE		0x0280
 #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
 #define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
 #define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000

Comments

On Thu, Mar 14, 2019 at 11:29:18AM -0700, Anusha wrote:
> From: Anusha Srivatsa <anusha.srivatsa@intel.com>
> 
> Comet Lake PCH is based off of Cannon Point(CNP).
> Add PCI ID for Comet Lake PCH.
> 
> v2: Code cleanup (DK)
> 
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 5 +++++
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 0d743907e7bc..b519c3685e80 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -188,6 +188,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>  		DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
>  		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>  		return PCH_CNP;
> +	case INTEL_PCH_CMP_DEVICE_ID_TYPE:
> +		DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
> +		WARN_ON(!IS_COFFEELAKE(dev_priv));
> +		/* CML has same South Display Engine from CNP */

maybe "inherit from" or "same as" ?

but the important is the comment is in place
and since I'm not native speaker I'm not confident
to require my bikeshed so with or without change:

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

> +		return PCH_CNP;
>  	case INTEL_PCH_ICP_DEVICE_ID_TYPE:
>  		DRM_DEBUG_KMS("Found Ice Lake PCH\n");
>  		WARN_ON(!IS_ICELAKE(dev_priv));
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index dccb6006aabf..4090462f591a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -537,7 +537,7 @@ enum intel_pch {
>  	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
>  	PCH_SPT,        /* Sunrisepoint PCH */
>  	PCH_KBP,        /* Kaby Lake PCH */
> -	PCH_CNP,        /* Cannon Lake PCH */
> +	PCH_CNP,        /* Cannon/Comet Lake PCH */
>  	PCH_ICP,	/* Ice Lake PCH */
>  };
>  
> @@ -2549,6 +2549,7 @@ static inline unsigned int i915_sg_segment_size(void)
>  #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
>  #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
>  #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE		0x9D80
> +#define INTEL_PCH_CMP_DEVICE_ID_TYPE		0x0280
>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000
> -- 
> 2.21.0
>
On Thu, 14 Mar 2019, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Thu, Mar 14, 2019 at 11:29:18AM -0700, Anusha wrote:
>> From: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> 
>> Comet Lake PCH is based off of Cannon Point(CNP).
>> Add PCI ID for Comet Lake PCH.
>> 
>> v2: Code cleanup (DK)
>> 
>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_drv.c | 5 +++++
>>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>>  2 files changed, 7 insertions(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 0d743907e7bc..b519c3685e80 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -188,6 +188,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>>  		DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
>>  		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>>  		return PCH_CNP;
>> +	case INTEL_PCH_CMP_DEVICE_ID_TYPE:
>> +		DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
>> +		WARN_ON(!IS_COFFEELAKE(dev_priv));
>> +		/* CML has same South Display Engine from CNP */
>
> maybe "inherit from" or "same as" ?
>
> but the important is the comment is in place
> and since I'm not native speaker I'm not confident
> to require my bikeshed so with or without change:

All other similar cases above have:

/* FOO is BAR compatible */

Which is essentially all we need to know from driver perspective. We
don't need to know if they're the same or if they inherit or what, if
all we care about is whether we can use the same driver code for both.


BR,
Jani.

>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
>> +		return PCH_CNP;
>>  	case INTEL_PCH_ICP_DEVICE_ID_TYPE:
>>  		DRM_DEBUG_KMS("Found Ice Lake PCH\n");
>>  		WARN_ON(!IS_ICELAKE(dev_priv));
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index dccb6006aabf..4090462f591a 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -537,7 +537,7 @@ enum intel_pch {
>>  	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
>>  	PCH_SPT,        /* Sunrisepoint PCH */
>>  	PCH_KBP,        /* Kaby Lake PCH */
>> -	PCH_CNP,        /* Cannon Lake PCH */
>> +	PCH_CNP,        /* Cannon/Comet Lake PCH */
>>  	PCH_ICP,	/* Ice Lake PCH */
>>  };
>>  
>> @@ -2549,6 +2549,7 @@ static inline unsigned int i915_sg_segment_size(void)
>>  #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
>>  #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
>>  #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE		0x9D80
>> +#define INTEL_PCH_CMP_DEVICE_ID_TYPE		0x0280
>>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
>>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
>>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000
>> -- 
>> 2.21.0
>> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx