diff mbox series

drm/i915: Add new CNL PCH ID seen on a CML platform

Message ID 20191022095155.30991-1-imre.deak@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Add new CNL PCH ID seen on a CML platform | expand

Commit Message

Imre Deak Oct. 22, 2019, 9:51 a.m. UTC
Atm we don't detect a PCH with PCI ID 0xA3C1 which showed up now on a CML
platform. We don't have the official assignment of the PCH PCI IDs, but
this looks like a CNP which was already used on CML platforms. Let's add
the new ID->PCH type mapping accordingly.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051
Reported-and-tested-by: Cyrus <cyrus.lien@canonical.com>
Cc: Cyrus <cyrus.lien@canonical.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)

Comments

Souza, Jose Oct. 22, 2019, 5:52 p.m. UTC | #1
On Tue, 2019-10-22 at 12:51 +0300, Imre Deak wrote:
> Atm we don't detect a PCH with PCI ID 0xA3C1 which showed up now on a
> CML
> platform. We don't have the official assignment of the PCH PCI IDs,
> but
> this looks like a CNP which was already used on CML platforms. Let's
> add
> the new ID->PCH type mapping accordingly.

Looks right...

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051
> Reported-and-tested-by: Cyrus <cyrus.lien@canonical.com>
> Cc: Cyrus <cyrus.lien@canonical.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pch.c | 1 +
>  drivers/gpu/drm/i915/intel_pch.h | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pch.c
> b/drivers/gpu/drm/i915/intel_pch.c
> index 1035d3d46fd8..43f23820d032 100644
> --- a/drivers/gpu/drm/i915/intel_pch.c
> +++ b/drivers/gpu/drm/i915/intel_pch.c
> @@ -61,6 +61,7 @@ intel_pch_type(const struct drm_i915_private
> *dev_priv, unsigned short id)
>  		/* KBP is SPT compatible */
>  		return PCH_SPT;
>  	case INTEL_PCH_CNP_DEVICE_ID_TYPE:
> +	case INTEL_PCH_CNP2_DEVICE_ID_TYPE:
>  		DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
>  		WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> !IS_COFFEELAKE(dev_priv));
>  		return PCH_CNP;
> diff --git a/drivers/gpu/drm/i915/intel_pch.h
> b/drivers/gpu/drm/i915/intel_pch.h
> index f4dc18c34291..1115c6a0522c 100644
> --- a/drivers/gpu/drm/i915/intel_pch.h
> +++ b/drivers/gpu/drm/i915/intel_pch.h
> @@ -40,6 +40,7 @@ enum intel_pch {
>  #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE		0x9D00
>  #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
>  #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
> +#define INTEL_PCH_CNP2_DEVICE_ID_TYPE		0xA380
>  #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
Imre Deak Oct. 23, 2019, 6:55 p.m. UTC | #2
On Tue, Oct 22, 2019 at 07:09:47PM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Add new CNL PCH ID seen on a CML platform
> URL   : https://patchwork.freedesktop.org/series/68375/
> State : success

Thanks for the review, pushed to -dinq.

> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7147_full -> Patchwork_14914_full
> ====================================================
> 
> Summary
> -------
> 
>   **SUCCESS**
> 
>   No regressions found.
> 
>   
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_14914_full:
> 
> ### IGT changes ###
> 
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * igt@kms_cursor_crc@pipe-a-cursor-128x128-random:
>     - {shard-tglb}:       [FAIL][1] ([fdo#111703]) -> [INCOMPLETE][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb2/igt@kms_cursor_crc@pipe-a-cursor-128x128-random.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb7/igt@kms_cursor_crc@pipe-a-cursor-128x128-random.html
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_14914_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_busy@busy-vcs1:
>     - shard-iclb:         [PASS][3] -> [SKIP][4] ([fdo#112080]) +17 similar issues
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb2/igt@gem_busy@busy-vcs1.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb5/igt@gem_busy@busy-vcs1.html
> 
>   * igt@gem_ctx_isolation@vcs1-reset:
>     - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#109276] / [fdo#112080]) +2 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb2/igt@gem_ctx_isolation@vcs1-reset.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb8/igt@gem_ctx_isolation@vcs1-reset.html
> 
>   * igt@gem_ctx_isolation@vecs0-s3:
>     - shard-kbl:          [PASS][7] -> [INCOMPLETE][8] ([fdo#103665])
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-kbl6/igt@gem_ctx_isolation@vecs0-s3.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-kbl4/igt@gem_ctx_isolation@vecs0-s3.html
> 
>   * igt@gem_exec_parallel@rcs0-contexts:
>     - shard-apl:          [PASS][9] -> [INCOMPLETE][10] ([fdo#103927])
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-apl1/igt@gem_exec_parallel@rcs0-contexts.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-apl7/igt@gem_exec_parallel@rcs0-contexts.html
> 
>   * igt@gem_exec_schedule@preempt-contexts-bsd2:
>     - shard-iclb:         [PASS][11] -> [SKIP][12] ([fdo#109276]) +18 similar issues
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb4/igt@gem_exec_schedule@preempt-contexts-bsd2.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb3/igt@gem_exec_schedule@preempt-contexts-bsd2.html
> 
>   * igt@gem_exec_schedule@reorder-wide-bsd:
>     - shard-iclb:         [PASS][13] -> [SKIP][14] ([fdo#111325]) +8 similar issues
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb8/igt@gem_exec_schedule@reorder-wide-bsd.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html
> 
>   * igt@gem_fence_thrash@bo-write-verify-threaded-y:
>     - shard-iclb:         [PASS][15] -> [INCOMPLETE][16] ([fdo#107713] / [fdo#109100])
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb7/igt@gem_fence_thrash@bo-write-verify-threaded-y.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb7/igt@gem_fence_thrash@bo-write-verify-threaded-y.html
> 
>   * igt@gem_persistent_relocs@forked-interruptible-thrashing:
>     - shard-hsw:          [PASS][17] -> [FAIL][18] ([fdo#112037])
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-hsw8/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-hsw8/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-busy:
>     - shard-snb:          [PASS][19] -> [DMESG-WARN][20] ([fdo#111870]) +1 similar issue
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-snb2/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-snb4/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
>     - shard-hsw:          [PASS][21] -> [DMESG-WARN][22] ([fdo#111870])
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
> 
>   * igt@kms_flip@flip-vs-expired-vblank:
>     - shard-skl:          [PASS][23] -> [FAIL][24] ([fdo#105363]) +1 similar issue
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl3/igt@kms_flip@flip-vs-expired-vblank.html
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl8/igt@kms_flip@flip-vs-expired-vblank.html
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-skl:          [PASS][25] -> [INCOMPLETE][26] ([fdo#109507])
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl7/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl6/igt@kms_flip@flip-vs-suspend-interruptible.html
>     - shard-apl:          [PASS][27] -> [DMESG-WARN][28] ([fdo#108566]) +4 similar issues
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-apl5/igt@kms_flip@flip-vs-suspend-interruptible.html
> 
>   * igt@kms_flip_tiling@flip-changes-tiling-y:
>     - shard-skl:          [PASS][29] -> [FAIL][30] ([fdo#107931] / [fdo#108303])
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl2/igt@kms_flip_tiling@flip-changes-tiling-y.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl4/igt@kms_flip_tiling@flip-changes-tiling-y.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
>     - shard-iclb:         [PASS][31] -> [FAIL][32] ([fdo#103167]) +2 similar issues
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
> 
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
>     - shard-iclb:         [PASS][33] -> [DMESG-WARN][34] ([fdo#111764])
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb8/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
> 
>   * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>     - shard-skl:          [PASS][35] -> [FAIL][36] ([fdo#108145] / [fdo#110403])
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
> 
>   * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
>     - shard-skl:          [PASS][37] -> [FAIL][38] ([fdo#108145]) +1 similar issue
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
> 
>   * igt@kms_psr@psr2_dpms:
>     - shard-iclb:         [PASS][39] -> [SKIP][40] ([fdo#109441])
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb2/igt@kms_psr@psr2_dpms.html
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb5/igt@kms_psr@psr2_dpms.html
> 
>   * igt@kms_vblank@pipe-c-query-forked-hang:
>     - shard-hsw:          [PASS][41] -> [INCOMPLETE][42] ([fdo#103540])
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-hsw1/igt@kms_vblank@pipe-c-query-forked-hang.html
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-hsw8/igt@kms_vblank@pipe-c-query-forked-hang.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_ctx_isolation@vcs1-none:
>     - shard-iclb:         [SKIP][43] ([fdo#109276] / [fdo#112080]) -> [PASS][44] +1 similar issue
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb5/igt@gem_ctx_isolation@vcs1-none.html
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@gem_ctx_isolation@vcs1-none.html
> 
>   * igt@gem_ctx_shared@q-smoketest-all:
>     - {shard-tglb}:       [INCOMPLETE][45] ([fdo#111735]) -> [PASS][46]
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb4/igt@gem_ctx_shared@q-smoketest-all.html
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb7/igt@gem_ctx_shared@q-smoketest-all.html
> 
>   * igt@gem_ctx_shared@q-smoketest-bsd2:
>     - shard-iclb:         [SKIP][47] ([fdo#109276]) -> [PASS][48] +17 similar issues
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb7/igt@gem_ctx_shared@q-smoketest-bsd2.html
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb4/igt@gem_ctx_shared@q-smoketest-bsd2.html
> 
>   * igt@gem_ctx_switch@vcs1:
>     - shard-iclb:         [SKIP][49] ([fdo#112080]) -> [PASS][50] +12 similar issues
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb5/igt@gem_ctx_switch@vcs1.html
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@gem_ctx_switch@vcs1.html
> 
>   * igt@gem_exec_balancer@smoke:
>     - shard-iclb:         [SKIP][51] ([fdo#110854]) -> [PASS][52]
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb6/igt@gem_exec_balancer@smoke.html
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb4/igt@gem_exec_balancer@smoke.html
> 
>   * igt@gem_exec_schedule@wide-bsd:
>     - shard-iclb:         [SKIP][53] ([fdo#111325]) -> [PASS][54] +2 similar issues
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb2/igt@gem_exec_schedule@wide-bsd.html
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb5/igt@gem_exec_schedule@wide-bsd.html
> 
>   * igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive:
>     - {shard-tglb}:       [TIMEOUT][55] ([fdo#112068 ]) -> [PASS][56]
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb6/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb4/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup:
>     - shard-snb:          [DMESG-WARN][57] ([fdo#111870]) -> [PASS][58]
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-snb7/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-snb6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
> 
>   * igt@i915_pm_rpm@system-suspend:
>     - {shard-tglb}:       [INCOMPLETE][59] ([fdo#111747] / [fdo#111850]) -> [PASS][60]
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb2/igt@i915_pm_rpm@system-suspend.html
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb6/igt@i915_pm_rpm@system-suspend.html
> 
>   * igt@kms_busy@extended-pageflip-hang-oldfb-render-a:
>     - {shard-tglb}:       [INCOMPLETE][61] ([fdo#111747]) -> [PASS][62]
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb7/igt@kms_busy@extended-pageflip-hang-oldfb-render-a.html
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb5/igt@kms_busy@extended-pageflip-hang-oldfb-render-a.html
> 
>   * igt@kms_color@pipe-a-ctm-blue-to-red:
>     - shard-skl:          [DMESG-WARN][63] ([fdo#106107]) -> [PASS][64]
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl10/igt@kms_color@pipe-a-ctm-blue-to-red.html
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl9/igt@kms_color@pipe-a-ctm-blue-to-red.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
>     - {shard-tglb}:       [FAIL][65] ([fdo#103167]) -> [PASS][66] +1 similar issue
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-tglb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
> 
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
>     - shard-apl:          [DMESG-WARN][67] ([fdo#108566]) -> [PASS][68] +1 similar issue
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-apl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-apl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
> 
>   * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
>     - shard-skl:          [FAIL][69] ([fdo#108145]) -> [PASS][70]
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-skl10/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
> 
>   * igt@kms_plane_cursor@pipe-a-primary-size-256:
>     - shard-kbl:          [DMESG-WARN][71] ([fdo#103558] / [fdo#105602]) -> [PASS][72] +9 similar issues
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-kbl3/igt@kms_plane_cursor@pipe-a-primary-size-256.html
>    [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-kbl3/igt@kms_plane_cursor@pipe-a-primary-size-256.html
> 
>   * igt@kms_psr2_su@frontbuffer:
>     - shard-iclb:         [SKIP][73] ([fdo#109642] / [fdo#111068]) -> [PASS][74]
>    [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb8/igt@kms_psr2_su@frontbuffer.html
>    [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
> 
>   * igt@kms_psr@psr2_sprite_mmap_gtt:
>     - shard-iclb:         [SKIP][75] ([fdo#109441]) -> [PASS][76] +1 similar issue
>    [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_gtt.html
>    [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
> 
>   * igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
>     - shard-kbl:          [INCOMPLETE][77] ([fdo#103665]) -> [PASS][78]
>    [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-kbl1/igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend.html
>    [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-kbl3/igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend.html
> 
>   
> #### Warnings ####
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv:
>     - shard-iclb:         [SKIP][79] ([fdo#109276] / [fdo#112080]) -> [FAIL][80] ([fdo#111329])
>    [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb5/igt@gem_ctx_isolation@vcs1-nonpriv.html
>    [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv.html
> 
>   * igt@gem_mocs_settings@mocs-settings-bsd2:
>     - shard-iclb:         [SKIP][81] ([fdo#109276]) -> [FAIL][82] ([fdo#111330]) +1 similar issue
>    [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb7/igt@gem_mocs_settings@mocs-settings-bsd2.html
>    [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb4/igt@gem_mocs_settings@mocs-settings-bsd2.html
> 
>   * igt@kms_dp_dsc@basic-dsc-enable-edp:
>     - shard-iclb:         [DMESG-WARN][83] ([fdo#107724]) -> [SKIP][84] ([fdo#109349])
>    [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
>    [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html
> 
>   * igt@kms_frontbuffer_tracking@psr-2p-pri-indfb-multidraw:
>     - shard-kbl:          [SKIP][85] ([fdo#105602] / [fdo#109271]) -> [SKIP][86] ([fdo#109271]) +8 similar issues
>    [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-kbl3/igt@kms_frontbuffer_tracking@psr-2p-pri-indfb-multidraw.html
>    [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-kbl3/igt@kms_frontbuffer_tracking@psr-2p-pri-indfb-multidraw.html
> 
>   * igt@kms_psr@psr2_suspend:
>     - shard-iclb:         [SKIP][87] ([fdo#109441]) -> [DMESG-WARN][88] ([fdo#107724])
>    [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-iclb5/igt@kms_psr@psr2_suspend.html
>    [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-iclb2/igt@kms_psr@psr2_suspend.html
> 
>   * igt@runner@aborted:
>     - shard-snb:          [FAIL][89] ([fdo#111249]) -> ([FAIL][90], [FAIL][91]) ([fdo#111249] / [fdo#111757])
>    [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7147/shard-snb1/igt@runner@aborted.html
>    [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-snb6/igt@runner@aborted.html
>    [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/shard-snb7/igt@runner@aborted.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo# 112000 ]: https://bugs.freedesktop.org/show_bug.cgi?id= 112000 
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
>   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
>   [fdo#107931]: https://bugs.freedesktop.org/show_bug.cgi?id=107931
>   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   [fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
>   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>   [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
>   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>   [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
>   [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
>   [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
>   [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
>   [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
>   [fdo#111249]: https://bugs.freedesktop.org/show_bug.cgi?id=111249
>   [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
>   [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
>   [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
>   [fdo#111703]: https://bugs.freedesktop.org/show_bug.cgi?id=111703
>   [fdo#111735]: https://bugs.freedesktop.org/show_bug.cgi?id=111735
>   [fdo#111747]: https://bugs.freedesktop.org/show_bug.cgi?id=111747
>   [fdo#111757]: https://bugs.freedesktop.org/s
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14914/index.html
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
index 1035d3d46fd8..43f23820d032 100644
--- a/drivers/gpu/drm/i915/intel_pch.c
+++ b/drivers/gpu/drm/i915/intel_pch.c
@@ -61,6 +61,7 @@  intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 		/* KBP is SPT compatible */
 		return PCH_SPT;
 	case INTEL_PCH_CNP_DEVICE_ID_TYPE:
+	case INTEL_PCH_CNP2_DEVICE_ID_TYPE:
 		DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
 		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
 		return PCH_CNP;
diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h
index f4dc18c34291..1115c6a0522c 100644
--- a/drivers/gpu/drm/i915/intel_pch.h
+++ b/drivers/gpu/drm/i915/intel_pch.h
@@ -40,6 +40,7 @@  enum intel_pch {
 #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE		0x9D00
 #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
 #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
+#define INTEL_PCH_CNP2_DEVICE_ID_TYPE		0xA380
 #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