[SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Timo Aaltonen-6
From: Matt Roper <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1848491

The CMP PCH ID we have in the driver is correct for the CML-U machines we have
in our CI system, but the CML-S and CML-H CI machines appear to use a
different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <[hidden email]>
Cc: Anusha Srivatsa <[hidden email]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
Signed-off-by: Matt Roper <[hidden email]>
Acked-by: Chris Wilson <[hidden email]>
Signed-off-by: Chris Wilson <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
(backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 drivers/gpu/drm/i915/i915_drv.c | 1 +
 drivers/gpu/drm/i915/i915_drv.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3df37c2b580b..0afbd77f5809 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -187,6 +187,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
  WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
  return PCH_CNP;
  case INTEL_PCH_CMP_DEVICE_ID_TYPE:
+ case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
  DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
  WARN_ON(!IS_COFFEELAKE(dev_priv));
  /* CometPoint is CNP Compatible */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 09d628527a78..a854c64261fe 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2540,6 +2540,7 @@ static inline unsigned int i915_sg_segment_size(void)
 #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_CMP2_DEVICE_ID_TYPE 0x0680
 #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.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Stefan Bader-2
On 17.10.19 14:19, Timo Aaltonen wrote:

> From: Matt Roper <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1848491
>
> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
> in our CI system, but the CML-S and CML-H CI machines appear to use a
> different PCH ID, leading our driver to detect no PCH for them.
>
> Cc: Rodrigo Vivi <[hidden email]>
> Cc: Anusha Srivatsa <[hidden email]>
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper <[hidden email]>
> Acked-by: Chris Wilson <[hidden email]>
> Signed-off-by: Chris Wilson <[hidden email]>
> Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
> (backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
> Signed-off-by: Timo Aaltonen <[hidden email]>
> ---
The way some people refer to oem kernel patches this sounds as it is also
requested for disco/master, however the bug report has that set to invalid.
Which markup is correct?

-Stefan

>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>  drivers/gpu/drm/i915/i915_drv.h | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 3df37c2b580b..0afbd77f5809 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -187,6 +187,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>   WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>   return PCH_CNP;
>   case INTEL_PCH_CMP_DEVICE_ID_TYPE:
> + case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
>   DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
>   WARN_ON(!IS_COFFEELAKE(dev_priv));
>   /* CometPoint is CNP Compatible */
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 09d628527a78..a854c64261fe 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2540,6 +2540,7 @@ static inline unsigned int i915_sg_segment_size(void)
>  #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_CMP2_DEVICE_ID_TYPE 0x0680
>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100
>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Timo Aaltonen-6
On 18.10.2019 16.33, Stefan Bader wrote:

> On 17.10.19 14:19, Timo Aaltonen wrote:
>> From: Matt Roper <[hidden email]>
>>
>> BugLink: http://bugs.launchpad.net/bugs/1848491
>>
>> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
>> in our CI system, but the CML-S and CML-H CI machines appear to use a
>> different PCH ID, leading our driver to detect no PCH for them.
>>
>> Cc: Rodrigo Vivi <[hidden email]>
>> Cc: Anusha Srivatsa <[hidden email]>
>> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
>> Signed-off-by: Matt Roper <[hidden email]>
>> Acked-by: Chris Wilson <[hidden email]>
>> Signed-off-by: Chris Wilson <[hidden email]>
>> Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
>> (backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
>> Signed-off-by: Timo Aaltonen <[hidden email]>
>> ---
>
> The way some people refer to oem kernel patches this sounds as it is also
> requested for disco/master, however the bug report has that set to invalid.
> Which markup is correct?
The bug was wrong, I've fixed it now.


--
t


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Stefan Bader-2
In reply to this post by Timo Aaltonen-6
On 17.10.19 14:19, Timo Aaltonen wrote:

> From: Matt Roper <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1848491
>
> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
> in our CI system, but the CML-S and CML-H CI machines appear to use a
> different PCH ID, leading our driver to detect no PCH for them.
>
> Cc: Rodrigo Vivi <[hidden email]>
> Cc: Anusha Srivatsa <[hidden email]>
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper <[hidden email]>
> Acked-by: Chris Wilson <[hidden email]>
> Signed-off-by: Chris Wilson <[hidden email]>
> Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
> (backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
> Signed-off-by: Timo Aaltonen <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>  drivers/gpu/drm/i915/i915_drv.h | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 3df37c2b580b..0afbd77f5809 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -187,6 +187,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>   WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>   return PCH_CNP;
>   case INTEL_PCH_CMP_DEVICE_ID_TYPE:
> + case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
>   DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
>   WARN_ON(!IS_COFFEELAKE(dev_priv));
>   /* CometPoint is CNP Compatible */
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 09d628527a78..a854c64261fe 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2540,6 +2540,7 @@ static inline unsigned int i915_sg_segment_size(void)
>  #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_CMP2_DEVICE_ID_TYPE 0x0680
>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100
>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

APPLIED[OEM-OSP1-B] Re: [SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
On 17.10.2019 15.19, Timo Aaltonen wrote:
> From: Matt Roper <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1848491
>
> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
> in our CI system, but the CML-S and CML-H CI machines appear to use a
> different PCH ID, leading our driver to detect no PCH for them.

applied to osp1 oem-next

--
t

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: ACK: [SRU][D/OEM-OSP1-B][PATCH] drm/i915/cml: Add second PCH ID for CMP

Stefan Bader-2
In reply to this post by Stefan Bader-2
On 21.10.19 14:30, Stefan Bader wrote:

> On 17.10.19 14:19, Timo Aaltonen wrote:
>> From: Matt Roper <[hidden email]>
>>
>> BugLink: http://bugs.launchpad.net/bugs/1848491
>>
>> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
>> in our CI system, but the CML-S and CML-H CI machines appear to use a
>> different PCH ID, leading our driver to detect no PCH for them.
>>
>> Cc: Rodrigo Vivi <[hidden email]>
>> Cc: Anusha Srivatsa <[hidden email]>
>> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
>> Signed-off-by: Matt Roper <[hidden email]>
>> Acked-by: Chris Wilson <[hidden email]>
>> Signed-off-by: Chris Wilson <[hidden email]>
>> Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
>> (backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
>> Signed-off-by: Timo Aaltonen <[hidden email]>
> Acked-by: Stefan Bader <[hidden email]>
>> ---
This still needs a second review to go into Disco.

>>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>>  drivers/gpu/drm/i915/i915_drv.h | 1 +
>>  2 files changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 3df37c2b580b..0afbd77f5809 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -187,6 +187,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>>   WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>>   return PCH_CNP;
>>   case INTEL_PCH_CMP_DEVICE_ID_TYPE:
>> + case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
>>   DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
>>   WARN_ON(!IS_COFFEELAKE(dev_priv));
>>   /* CometPoint is CNP Compatible */
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 09d628527a78..a854c64261fe 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -2540,6 +2540,7 @@ static inline unsigned int i915_sg_segment_size(void)
>>  #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_CMP2_DEVICE_ID_TYPE 0x0680
>>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
>>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100
>>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000
>>
>
>
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

APPLIED: [SRU][D][PATCH] drm/i915/cml: Add second PCH ID for CMP

Stefan Bader-2
In reply to this post by Timo Aaltonen-6
On 17.10.19 14:19, Timo Aaltonen wrote:

> From: Matt Roper <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1848491
>
> The CMP PCH ID we have in the driver is correct for the CML-U machines we have
> in our CI system, but the CML-S and CML-H CI machines appear to use a
> different PCH ID, leading our driver to detect no PCH for them.
>
> Cc: Rodrigo Vivi <[hidden email]>
> Cc: Anusha Srivatsa <[hidden email]>
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper <[hidden email]>
> Acked-by: Chris Wilson <[hidden email]>
> Signed-off-by: Chris Wilson <[hidden email]>
> Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@...
> (backported from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780)
> Signed-off-by: Timo Aaltonen <[hidden email]>
> ---
Applied to disco/master-next. Thanks.

-Stefan

>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>  drivers/gpu/drm/i915/i915_drv.h | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 3df37c2b580b..0afbd77f5809 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -187,6 +187,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>   WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
>   return PCH_CNP;
>   case INTEL_PCH_CMP_DEVICE_ID_TYPE:
> + case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
>   DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
>   WARN_ON(!IS_COFFEELAKE(dev_priv));
>   /* CometPoint is CNP Compatible */
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 09d628527a78..a854c64261fe 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2540,6 +2540,7 @@ static inline unsigned int i915_sg_segment_size(void)
>  #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_CMP2_DEVICE_ID_TYPE 0x0680
>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100
>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment