diff mbox series

drm/i915: Introduce Jasper Lake PCH

Message ID 20191014212431.4078-1-matthew.d.roper@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Introduce Jasper Lake PCH | expand

Commit Message

Matt Roper Oct. 14, 2019, 9:24 p.m. UTC
The Jasper Lake PCH follows ICP/TGP's south display behavior and is
identical to MCC graphics-wise except that it does not use the unusual
(port C -> TC1) pin mapping that MCC does.

Also, it turns out the extra PCH ID that we had previously thought was a
form of MCC is actually a second ID for JSP (i.e., port C uses the port
C pins instead of the TC1 pins).

Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c  | 17 ++++++++++++++---
 drivers/gpu/drm/i915/intel_pch.c |  6 +++++-
 drivers/gpu/drm/i915/intel_pch.h |  5 ++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

Comments

Kasireddy, Vivek Oct. 14, 2019, 9:59 p.m. UTC | #1
On Mon, 14 Oct 2019 14:24:31 -0700
Matt Roper <matthew.d.roper@intel.com> wrote:

> The Jasper Lake PCH follows ICP/TGP's south display behavior and is
> identical to MCC graphics-wise except that it does not use the unusual
> (port C -> TC1) pin mapping that MCC does.
> 
> Also, it turns out the extra PCH ID that we had previously thought
> was a form of MCC is actually a second ID for JSP (i.e., port C uses
> the port C pins instead of the TC1 pins).
> 
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Cc: James Ausmus <james.ausmus@intel.com>
> Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c  | 17 ++++++++++++++---
>  drivers/gpu/drm/i915/intel_pch.c |  6 +++++-
>  drivers/gpu/drm/i915/intel_pch.h |  5 ++++-
>  3 files changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c
> b/drivers/gpu/drm/i915/i915_irq.c index d20ca02d3166..de16576bb5fa
> 100644 --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2248,11 +2248,18 @@ static void icp_irq_handler(struct
> drm_i915_private *dev_priv, u32 pch_iir) tc_hotplug_trigger = pch_iir
> & SDE_TC_MASK_TGP; tc_port_hotplug_long_detect =
> tgp_tc_port_hotplug_long_detect; pins = hpd_tgp;
> +	} else if (HAS_PCH_JSP(dev_priv)) {
> +		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
> +		tc_hotplug_trigger = 0;
> +		pins = hpd_tgp;
>  	} else if (HAS_PCH_MCC(dev_priv)) {
>  		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
>  		tc_hotplug_trigger = pch_iir &
> SDE_TC_HOTPLUG_ICP(PORT_TC1); pins = hpd_icp;
>  	} else {
> +		WARN(!HAS_PCH_ICP(dev_priv),
> +		     "Unrecognized PCH type 0x%x\n",
> INTEL_PCH_TYPE(dev_priv)); +
>  		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
>  		tc_hotplug_trigger = pch_iir & SDE_TC_MASK_ICP;
>  		tc_port_hotplug_long_detect =
> icp_tc_port_hotplug_long_detect; @@ -3373,15 +3380,19 @@ static void
> icp_hpd_irq_setup(struct drm_i915_private *dev_priv, }
>  
>  /*
> - * EHL doesn't need most of gen11_hpd_irq_setup, it's handling only
> the
> + * EHL/JSL don't need most of gen11_hpd_irq_setup, they're handling
> only the
>   * equivalent of SDE.
> + *
> + * Note that MCC and JSP have different port C pin mappings, hence
> the use of
> + * ICP's table (hpd C on TC1) vs TGP's table (hpd C on DDIC)
> depending on
> + * platform.
>   */
>  static void mcc_hpd_irq_setup(struct drm_i915_private *dev_priv)
>  {
>  	icp_hpd_irq_setup(dev_priv,
>  			  SDE_DDI_MASK_ICP,
> SDE_TC_HOTPLUG_ICP(PORT_TC1), ICP_DDI_HPD_ENABLE_MASK,
> ICP_TC_HPD_ENABLE(PORT_TC1),
> -			  hpd_icp);
> +			  HAS_PCH_JSP(dev_priv) ? hpd_tgp : hpd_icp);
Unless I am misreading this, shouldn't you change the ddi_mask and
ddi_enable_mask to _TGP as well?

Thanks,
Vivek
>  }
>  
>  static void gen11_hpd_detection_setup(struct drm_i915_private
> *dev_priv) @@ -4315,7 +4326,7 @@ void intel_irq_init(struct
> drm_i915_private *dev_priv) if (I915_HAS_HOTPLUG(dev_priv))
>  			dev_priv->display.hpd_irq_setup =
> i915_hpd_irq_setup; } else {
> -		if (HAS_PCH_MCC(dev_priv))
> +		if (HAS_PCH_MCC(dev_priv) || HAS_PCH_JSP(dev_priv))
>  			dev_priv->display.hpd_irq_setup =
> mcc_hpd_irq_setup; else if (INTEL_GEN(dev_priv) >= 11)
>  			dev_priv->display.hpd_irq_setup =
> gen11_hpd_irq_setup; diff --git a/drivers/gpu/drm/i915/intel_pch.c
> b/drivers/gpu/drm/i915/intel_pch.c index 15f8bff141f9..1035d3d46fd8
> 100644 --- a/drivers/gpu/drm/i915/intel_pch.c
> +++ b/drivers/gpu/drm/i915/intel_pch.c
> @@ -79,7 +79,6 @@ intel_pch_type(const struct drm_i915_private
> *dev_priv, unsigned short id) WARN_ON(!IS_ICELAKE(dev_priv));
>  		return PCH_ICP;
>  	case INTEL_PCH_MCC_DEVICE_ID_TYPE:
> -	case INTEL_PCH_MCC2_DEVICE_ID_TYPE:
>  		DRM_DEBUG_KMS("Found Mule Creek Canyon PCH\n");
>  		WARN_ON(!IS_ELKHARTLAKE(dev_priv));
>  		return PCH_MCC;
> @@ -87,6 +86,11 @@ intel_pch_type(const struct drm_i915_private
> *dev_priv, unsigned short id) DRM_DEBUG_KMS("Found Tiger Lake LP
> PCH\n"); WARN_ON(!IS_TIGERLAKE(dev_priv));
>  		return PCH_TGP;
> +	case INTEL_PCH_JSP_DEVICE_ID_TYPE:
> +	case INTEL_PCH_JSP2_DEVICE_ID_TYPE:
> +		DRM_DEBUG_KMS("Found Jasper Lake PCH\n");
> +		WARN_ON(!IS_ELKHARTLAKE(dev_priv));
> +		return PCH_JSP;
>  	default:
>  		return PCH_NONE;
>  	}
> diff --git a/drivers/gpu/drm/i915/intel_pch.h
> b/drivers/gpu/drm/i915/intel_pch.h index c29c81ec7971..f4dc18c34291
> 100644 --- a/drivers/gpu/drm/i915/intel_pch.h
> +++ b/drivers/gpu/drm/i915/intel_pch.h
> @@ -23,6 +23,7 @@ enum intel_pch {
>  	PCH_SPT,        /* Sunrisepoint/Kaby Lake PCH */
>  	PCH_CNP,        /* Cannon/Comet Lake PCH */
>  	PCH_ICP,	/* Ice Lake PCH */
> +	PCH_JSP,	/* Jasper Lake PCH */
>  	PCH_MCC,        /* Mule Creek Canyon PCH */
>  	PCH_TGP,	/* Tiger Lake PCH */
>  };
> @@ -44,14 +45,16 @@ enum intel_pch {
>  #define INTEL_PCH_CMP2_DEVICE_ID_TYPE		0x0680
>  #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
>  #define INTEL_PCH_MCC_DEVICE_ID_TYPE		0x4B00
> -#define INTEL_PCH_MCC2_DEVICE_ID_TYPE		0x3880
>  #define INTEL_PCH_TGP_DEVICE_ID_TYPE		0xA080
> +#define INTEL_PCH_JSP_DEVICE_ID_TYPE		0x4D80
> +#define INTEL_PCH_JSP2_DEVICE_ID_TYPE		0x3880
>  #define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
>  #define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000
>  #define INTEL_PCH_QEMU_DEVICE_ID_TYPE		0x2900 /* qemu
> q35 has 2918 */ 
>  #define INTEL_PCH_TYPE(dev_priv)
> ((dev_priv)->pch_type) #define INTEL_PCH_ID(dev_priv)
> 	((dev_priv)->pch_id) +#define HAS_PCH_JSP(dev_priv)
> 		(INTEL_PCH_TYPE(dev_priv) == PCH_JSP) #define
> HAS_PCH_MCC(dev_priv)
> (INTEL_PCH_TYPE(dev_priv) == PCH_MCC) #define
> HAS_PCH_TGP(dev_priv)
> (INTEL_PCH_TYPE(dev_priv) == PCH_TGP) #define
> HAS_PCH_ICP(dev_priv)
> (INTEL_PCH_TYPE(dev_priv) == PCH_ICP)
Matt Roper Oct. 15, 2019, 7:56 p.m. UTC | #2
On Tue, Oct 15, 2019 at 07:42:03PM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Introduce Jasper Lake PCH (rev3)
> URL   : https://patchwork.freedesktop.org/series/67992/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7098 -> Patchwork_14817
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_14817 absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_14817, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/index.html
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_14817:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@i915_selftest@live_gem_contexts:
>     - fi-cfl-8109u:       [PASS][1] -> [DMESG-FAIL][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-cfl-8109u/igt@i915_selftest@live_gem_contexts.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-cfl-8109u/igt@i915_selftest@live_gem_contexts.html


Selftest timeout failure; not related to PCH changes here.  Will request
a re-test.

(i915_selftest:4885) igt_kmod-WARNING: i915: probe of 0000:00:02.0 failed with error -62
(i915_selftest:4885) igt_kmod-CRITICAL: Test assertion failure function igt_kselftest_execute, file ../lib/igt_kmod.c:548:
(i915_selftest:4885) igt_kmod-CRITICAL: Failed assertion: err == 0
(i915_selftest:4885) igt_kmod-CRITICAL: kselftest "i915 igt__31__live_gem_contexts=1 live_selftests=-1 disable_display=1 st_filter=" failed: Timer expired [62]
Subtest live_gem_contexts failed.


Matt

> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * igt@i915_selftest@live_hangcheck:
>     - {fi-cml-s}:         [PASS][3] -> [DMESG-FAIL][4]
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-cml-s/igt@i915_selftest@live_hangcheck.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-cml-s/igt@i915_selftest@live_hangcheck.html
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_14817 that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_basic@create-close:
>     - fi-icl-u3:          [PASS][5] -> [DMESG-WARN][6] ([fdo#107724])
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-icl-u3/igt@gem_basic@create-close.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-icl-u3/igt@gem_basic@create-close.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_ctx_create@basic-files:
>     - fi-bxt-dsi:         [INCOMPLETE][7] ([fdo#103927]) -> [PASS][8]
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-bxt-dsi/igt@gem_ctx_create@basic-files.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-bxt-dsi/igt@gem_ctx_create@basic-files.html
>     - fi-icl-u3:          [INCOMPLETE][9] ([fdo#107713] / [fdo#109100]) -> [PASS][10]
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-icl-u3/igt@gem_ctx_create@basic-files.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-icl-u3/igt@gem_ctx_create@basic-files.html
> 
>   * igt@i915_selftest@live_execlists:
>     - fi-apl-guc:         [INCOMPLETE][11] ([fdo#103927]) -> [PASS][12]
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-apl-guc/igt@i915_selftest@live_execlists.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-apl-guc/igt@i915_selftest@live_execlists.html
> 
>   * igt@i915_selftest@live_hangcheck:
>     - {fi-icl-u4}:        [INCOMPLETE][13] ([fdo#107713] / [fdo#108569]) -> [PASS][14]
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-icl-u4/igt@i915_selftest@live_hangcheck.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-icl-u4/igt@i915_selftest@live_hangcheck.html
> 
>   
> #### Warnings ####
> 
>   * igt@kms_chamelium@hdmi-hpd-fast:
>     - fi-kbl-7500u:       [FAIL][15] ([fdo#111407]) -> [FAIL][16] ([fdo#111045] / [fdo#111096])
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7098/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
>   [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
>   [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
>   [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
>   [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
>   [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
> 
> 
> Participating hosts (53 -> 44)
> ------------------------------
> 
>   Missing    (9): fi-ilk-m540 fi-hsw-4200u fi-tgl-u2 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-icl-guc fi-byt-clapper fi-bdw-samus 
> 
> 
> Build changes
> -------------
> 
>   * CI: CI-20190529 -> None
>   * Linux: CI_DRM_7098 -> Patchwork_14817
> 
>   CI-20190529: 20190529
>   CI_DRM_7098: 4e4fe1f2e2ff11f066e3ea4706dec0dded6925e5 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_5231: e293051f8f99c72cb01d21e4b73a5928ea351eb3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_14817: 47be6f8097acad3b7c82317190ae2e61da823020 @ git://anongit.freedesktop.org/gfx-ci/linux
> 
> 
> == Linux commits ==
> 
> 47be6f8097ac drm/i915: Introduce Jasper Lake PCH
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14817/index.html
Matt Roper Oct. 16, 2019, 2:58 p.m. UTC | #3
On Wed, Oct 16, 2019 at 11:28:23AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Introduce Jasper Lake PCH (rev4)
> URL   : https://patchwork.freedesktop.org/series/67992/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7099_full -> Patchwork_14822_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_14822_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_14822_full, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_14822_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@gem_persistent_relocs@forked-interruptible-thrashing:
>     - shard-iclb:         [PASS][1] -> [FAIL][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb8/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb5/igt@gem_persistent_relocs@forked-interruptible-thrashing.html

Unrelated GEM failure (which seems to be happening on several CI reports
this morning).  I don't see any open fdo bugs that match this, so I'll
open a new one shortly if I don't find any matches after some more
searching.

PCH patch applied to dinq.  Thanks for the review.


Matt

> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * igt@kms_atomic_transition@4x-modeset-transitions-nonblocking:
>     - {shard-tglb}:       NOTRUN -> [SKIP][3] +3 similar issues
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_atomic_transition@4x-modeset-transitions-nonblocking.html
> 
>   * igt@kms_content_protection@srm:
>     - {shard-tglb}:       NOTRUN -> [INCOMPLETE][4]
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_content_protection@srm.html
> 
>   * {igt@kms_cursor_crc@pipe-d-cursor-256x256-onscreen}:
>     - {shard-tglb}:       NOTRUN -> [FAIL][5] +2 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-256x256-onscreen.html
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_14822_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_ctx_shared@exec-single-timeline-bsd:
>     - shard-iclb:         [PASS][6] -> [SKIP][7] ([fdo#110841])
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd.html
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
> 
>   * igt@gem_eio@in-flight-contexts-immediate:
>     - shard-snb:          [PASS][8] -> [FAIL][9] ([fdo#111925])
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-snb7/igt@gem_eio@in-flight-contexts-immediate.html
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-snb2/igt@gem_eio@in-flight-contexts-immediate.html
> 
>   * igt@gem_exec_balancer@smoke:
>     - shard-iclb:         [PASS][10] -> [SKIP][11] ([fdo#110854])
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_exec_balancer@smoke.html
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_balancer@smoke.html
> 
>   * igt@gem_exec_schedule@out-order-bsd2:
>     - shard-iclb:         [PASS][12] -> [SKIP][13] ([fdo#109276]) +17 similar issues
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_exec_schedule@out-order-bsd2.html
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_schedule@out-order-bsd2.html
> 
>   * igt@gem_exec_schedule@preempt-other-chain-bsd:
>     - shard-iclb:         [PASS][14] -> [SKIP][15] ([fdo#111325]) +4 similar issues
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb6/igt@gem_exec_schedule@preempt-other-chain-bsd.html
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html
> 
>   * igt@gem_softpin@noreloc-s3:
>     - shard-apl:          [PASS][16] -> [DMESG-WARN][17] ([fdo#108566]) +4 similar issues
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl4/igt@gem_softpin@noreloc-s3.html
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl4/igt@gem_softpin@noreloc-s3.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-hsw:          [PASS][18] -> [DMESG-WARN][19] ([fdo#111870]) +1 similar issue
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw8/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw8/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@kms_atomic_transition@plane-all-transition:
>     - shard-apl:          [PASS][20] -> [INCOMPLETE][21] ([fdo#103927])
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl2/igt@kms_atomic_transition@plane-all-transition.html
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl6/igt@kms_atomic_transition@plane-all-transition.html
> 
>   * igt@kms_color@pipe-a-ctm-0-75:
>     - shard-skl:          [PASS][22] -> [DMESG-WARN][23] ([fdo#106107]) +1 similar issue
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl6/igt@kms_color@pipe-a-ctm-0-75.html
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl5/igt@kms_color@pipe-a-ctm-0-75.html
> 
>   * igt@kms_flip@flip-vs-suspend:
>     - shard-hsw:          [PASS][24] -> [INCOMPLETE][25] ([fdo#103540])
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw8/igt@kms_flip@flip-vs-suspend.html
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw7/igt@kms_flip@flip-vs-suspend.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite:
>     - shard-iclb:         [PASS][26] -> [FAIL][27] ([fdo#103167]) +4 similar issues
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
> 
>   * igt@kms_plane_lowres@pipe-a-tiling-x:
>     - shard-iclb:         [PASS][28] -> [FAIL][29] ([fdo#103166])
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-x.html
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-x.html
> 
>   * igt@kms_psr@psr2_sprite_blt:
>     - shard-iclb:         [PASS][30] -> [SKIP][31] ([fdo#109441])
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_exec_schedule@wide-bsd:
>     - shard-iclb:         [SKIP][32] ([fdo#111325]) -> [PASS][33] +2 similar issues
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb2/igt@gem_exec_schedule@wide-bsd.html
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_schedule@wide-bsd.html
> 
>   * igt@gem_linear_blits@interruptible:
>     - shard-apl:          [INCOMPLETE][34] ([fdo#103927]) -> [PASS][35] +1 similar issue
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl6/igt@gem_linear_blits@interruptible.html
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl7/igt@gem_linear_blits@interruptible.html
> 
>   * igt@gem_userptr_blits@dmabuf-sync:
>     - shard-snb:          [DMESG-WARN][36] ([fdo#111870]) -> [PASS][37]
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-snb1/igt@gem_userptr_blits@dmabuf-sync.html
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-snb7/igt@gem_userptr_blits@dmabuf-sync.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-glk:          [DMESG-WARN][38] ([fdo#111870]) -> [PASS][39]
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-glk7/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-glk2/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@gem_userptr_blits@sync-unmap-cycles:
>     - shard-hsw:          [DMESG-WARN][40] ([fdo#111870]) -> [PASS][41]
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw6/igt@gem_userptr_blits@sync-unmap-cycles.html
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw7/igt@gem_userptr_blits@sync-unmap-cycles.html
> 
>   * igt@i915_pm_backlight@fade_with_suspend:
>     - {shard-tglb}:       [INCOMPLETE][42] ([fdo#111832]) -> [PASS][43]
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-tglb5/igt@i915_pm_backlight@fade_with_suspend.html
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb4/igt@i915_pm_backlight@fade_with_suspend.html
> 
>   * igt@i915_selftest@live_hangcheck:
>     - shard-hsw:          [DMESG-FAIL][44] ([fdo#111991]) -> [PASS][45]
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw6/igt@i915_selftest@live_hangcheck.html
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw8/igt@i915_selftest@live_hangcheck.html
> 
>   * igt@i915_suspend@fence-restore-tiled2untiled:
>     - shard-apl:          [DMESG-WARN][46] ([fdo#108566]) -> [PASS][47] +5 similar issues
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl1/igt@i915_suspend@fence-restore-tiled2untiled.html
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl1/igt@i915_suspend@fence-restore-tiled2untiled.html
> 
>   * igt@kms_cursor_legacy@cursora-vs-flipa-legacy:
>     - shard-iclb:         [INCOMPLETE][48] ([fdo#107713]) -> [PASS][49]
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb7/igt@kms_cursor_legacy@cursora-vs-flipa-legacy.html
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb6/igt@kms_cursor_legacy@cursora-vs-flipa-legacy.html
> 
>   * igt@kms_flip@flip-vs-expired-vblank-interruptible:
>     - shard-skl:          [FAIL][50] ([fdo#105363]) -> [PASS][51]
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> 
>   * igt@kms_flip@modeset-vs-vblank-race:
>     - shard-glk:          [FAIL][52] ([fdo#111609]) -> [PASS][53]
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-glk1/igt@kms_flip@modeset-vs-vblank-race.html
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-glk4/igt@kms_flip@modeset-vs-vblank-race.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
>     - shard-iclb:         [FAIL][54] ([fdo#103167]) -> [PASS][55] +3 similar issues
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> 
>   * igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu:
>     - shard-skl:          [FAIL][56] ([fdo#103167]) -> [PASS][57]
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl3/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl8/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html
> 
>   * igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
>     - {shard-tglb}:       [INCOMPLETE][58] -> [PASS][59]
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-tglb4/igt@kms_plane_multiple@atomic-pipe-c-tiling-y.html
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_plane_multiple@atomic-pipe-c-tiling-y.html
> 
>   * igt@kms_psr@psr2_cursor_render:
>     - shard-iclb:         [SKIP][60] ([fdo#109441]) -> [PASS][61] +3 similar issues
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb4/igt@kms_psr@psr2_cursor_render.html
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
> 
>   * igt@kms_setmode@basic:
>     - shard-apl:          [FAIL][62] ([fdo#99912]) -> [PASS][63]
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl8/igt@kms_setmode@basic.html
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl1/igt@kms_setmode@basic.html
> 
>   * igt@prime_busy@hang-bsd2:
>     - shard-iclb:         [SKIP][64] ([fdo#109276]) -> [PASS][65] +12 similar issues
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@prime_busy@hang-bsd2.html
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@prime_busy@hang-bsd2.html
> 
>   
> #### Warnings ####
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv:
>     - shard-iclb:         [FAIL][66] ([fdo#111329]) -> [SKIP][67] ([fdo#109276])
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv.html
> 
>   * igt@gem_mocs_settings@mocs-reset-bsd2:
>     - shard-iclb:         [FAIL][68] ([fdo#111330]) -> [SKIP][69] ([fdo#109276])
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb5/igt@gem_mocs_settings@mocs-reset-bsd2.html
> 
>   * igt@gem_mocs_settings@mocs-settings-bsd2:
>     - shard-iclb:         [SKIP][70] ([fdo#109276]) -> [FAIL][71] ([fdo#111330]) +1 similar issue
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb7/igt@gem_mocs_settings@mocs-settings-bsd2.html
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@gem_mocs_settings@mocs-settings-bsd2.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>   [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548
>   [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
>   [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
>   [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#111609]: https://bugs.freedesktop.org/show_bug.cgi?id=111609
>   [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
>   [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850
>   [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
>   [fdo#111925]: https://bugs.freedesktop.org/show_bug.cgi?id=111925
>   [fdo#111991]: https://bugs.freedesktop.org/show_bug.cgi?id=111991
>   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> Participating hosts (10 -> 11)
> ------------------------------
> 
>   Additional (1): pig-skl-6260u 
> 
> 
> Build changes
> -------------
> 
>   * CI: CI-20190529 -> None
>   * Linux: CI_DRM_7099 -> Patchwork_14822
> 
>   CI-20190529: 20190529
>   CI_DRM_7099: fccd0abc9c05536751c60aabe5710c173fb8ffa6 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_5231: e293051f8f99c72cb01d21e4b73a5928ea351eb3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_14822: af8d69d10bd5974bdeea22eaf30e6e497728f916 @ git://anongit.freedesktop.org/gfx-ci/linux
>   piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/index.html
Matt Roper Oct. 16, 2019, 3:11 p.m. UTC | #4
On Wed, Oct 16, 2019 at 07:58:00AM -0700, Matt Roper wrote:
> On Wed, Oct 16, 2019 at 11:28:23AM +0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: drm/i915: Introduce Jasper Lake PCH (rev4)
> > URL   : https://patchwork.freedesktop.org/series/67992/
> > State : failure
> > 
> > == Summary ==
> > 
> > CI Bug Log - changes from CI_DRM_7099_full -> Patchwork_14822_full
> > ====================================================
> > 
> > Summary
> > -------
> > 
> >   **FAILURE**
> > 
> >   Serious unknown changes coming with Patchwork_14822_full absolutely need to be
> >   verified manually.
> >   
> >   If you think the reported changes have nothing to do with the changes
> >   introduced in Patchwork_14822_full, please notify your bug team to allow them
> >   to document this new failure mode, which will reduce false positives in CI.
> > 
> >   
> > 
> > Possible new issues
> > -------------------
> > 
> >   Here are the unknown changes that may have been introduced in Patchwork_14822_full:
> > 
> > ### IGT changes ###
> > 
> > #### Possible regressions ####
> > 
> >   * igt@gem_persistent_relocs@forked-interruptible-thrashing:
> >     - shard-iclb:         [PASS][1] -> [FAIL][2]
> >    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb8/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
> >    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb5/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
> 
> Unrelated GEM failure (which seems to be happening on several CI reports
> this morning).  I don't see any open fdo bugs that match this, so I'll
> open a new one shortly if I don't find any matches after some more
> searching.

Didn't find any bugs that looked obviously related, so filed a new one:

   https://bugs.freedesktop.org/show_bug.cgi?id=112037

I did notice one other recent CI failure on the same test here:

   https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14821/shard-apl3/igt@gem_persistent_relocs@forked-thrashing.html

where the test itself passes, but bad lock ordering is reported by the
kernel, which might be a clue as to what's going on.


Matt

> 
> PCH patch applied to dinq.  Thanks for the review.
> 
> 
> Matt
> 
> > 
> >   
> > #### Suppressed ####
> > 
> >   The following results come from untrusted machines, tests, or statuses.
> >   They do not affect the overall result.
> > 
> >   * igt@kms_atomic_transition@4x-modeset-transitions-nonblocking:
> >     - {shard-tglb}:       NOTRUN -> [SKIP][3] +3 similar issues
> >    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_atomic_transition@4x-modeset-transitions-nonblocking.html
> > 
> >   * igt@kms_content_protection@srm:
> >     - {shard-tglb}:       NOTRUN -> [INCOMPLETE][4]
> >    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_content_protection@srm.html
> > 
> >   * {igt@kms_cursor_crc@pipe-d-cursor-256x256-onscreen}:
> >     - {shard-tglb}:       NOTRUN -> [FAIL][5] +2 similar issues
> >    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-256x256-onscreen.html
> > 
> >   
> > Known issues
> > ------------
> > 
> >   Here are the changes found in Patchwork_14822_full that come from known issues:
> > 
> > ### IGT changes ###
> > 
> > #### Issues hit ####
> > 
> >   * igt@gem_ctx_shared@exec-single-timeline-bsd:
> >     - shard-iclb:         [PASS][6] -> [SKIP][7] ([fdo#110841])
> >    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd.html
> >    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
> > 
> >   * igt@gem_eio@in-flight-contexts-immediate:
> >     - shard-snb:          [PASS][8] -> [FAIL][9] ([fdo#111925])
> >    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-snb7/igt@gem_eio@in-flight-contexts-immediate.html
> >    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-snb2/igt@gem_eio@in-flight-contexts-immediate.html
> > 
> >   * igt@gem_exec_balancer@smoke:
> >     - shard-iclb:         [PASS][10] -> [SKIP][11] ([fdo#110854])
> >    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_exec_balancer@smoke.html
> >    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_balancer@smoke.html
> > 
> >   * igt@gem_exec_schedule@out-order-bsd2:
> >     - shard-iclb:         [PASS][12] -> [SKIP][13] ([fdo#109276]) +17 similar issues
> >    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_exec_schedule@out-order-bsd2.html
> >    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_schedule@out-order-bsd2.html
> > 
> >   * igt@gem_exec_schedule@preempt-other-chain-bsd:
> >     - shard-iclb:         [PASS][14] -> [SKIP][15] ([fdo#111325]) +4 similar issues
> >    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb6/igt@gem_exec_schedule@preempt-other-chain-bsd.html
> >    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html
> > 
> >   * igt@gem_softpin@noreloc-s3:
> >     - shard-apl:          [PASS][16] -> [DMESG-WARN][17] ([fdo#108566]) +4 similar issues
> >    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl4/igt@gem_softpin@noreloc-s3.html
> >    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl4/igt@gem_softpin@noreloc-s3.html
> > 
> >   * igt@gem_userptr_blits@sync-unmap-after-close:
> >     - shard-hsw:          [PASS][18] -> [DMESG-WARN][19] ([fdo#111870]) +1 similar issue
> >    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw8/igt@gem_userptr_blits@sync-unmap-after-close.html
> >    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw8/igt@gem_userptr_blits@sync-unmap-after-close.html
> > 
> >   * igt@kms_atomic_transition@plane-all-transition:
> >     - shard-apl:          [PASS][20] -> [INCOMPLETE][21] ([fdo#103927])
> >    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl2/igt@kms_atomic_transition@plane-all-transition.html
> >    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl6/igt@kms_atomic_transition@plane-all-transition.html
> > 
> >   * igt@kms_color@pipe-a-ctm-0-75:
> >     - shard-skl:          [PASS][22] -> [DMESG-WARN][23] ([fdo#106107]) +1 similar issue
> >    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl6/igt@kms_color@pipe-a-ctm-0-75.html
> >    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl5/igt@kms_color@pipe-a-ctm-0-75.html
> > 
> >   * igt@kms_flip@flip-vs-suspend:
> >     - shard-hsw:          [PASS][24] -> [INCOMPLETE][25] ([fdo#103540])
> >    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw8/igt@kms_flip@flip-vs-suspend.html
> >    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw7/igt@kms_flip@flip-vs-suspend.html
> > 
> >   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite:
> >     - shard-iclb:         [PASS][26] -> [FAIL][27] ([fdo#103167]) +4 similar issues
> >    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
> >    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
> > 
> >   * igt@kms_plane_lowres@pipe-a-tiling-x:
> >     - shard-iclb:         [PASS][28] -> [FAIL][29] ([fdo#103166])
> >    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-x.html
> >    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-x.html
> > 
> >   * igt@kms_psr@psr2_sprite_blt:
> >     - shard-iclb:         [PASS][30] -> [SKIP][31] ([fdo#109441])
> >    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
> >    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
> > 
> >   
> > #### Possible fixes ####
> > 
> >   * igt@gem_exec_schedule@wide-bsd:
> >     - shard-iclb:         [SKIP][32] ([fdo#111325]) -> [PASS][33] +2 similar issues
> >    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb2/igt@gem_exec_schedule@wide-bsd.html
> >    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_exec_schedule@wide-bsd.html
> > 
> >   * igt@gem_linear_blits@interruptible:
> >     - shard-apl:          [INCOMPLETE][34] ([fdo#103927]) -> [PASS][35] +1 similar issue
> >    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl6/igt@gem_linear_blits@interruptible.html
> >    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl7/igt@gem_linear_blits@interruptible.html
> > 
> >   * igt@gem_userptr_blits@dmabuf-sync:
> >     - shard-snb:          [DMESG-WARN][36] ([fdo#111870]) -> [PASS][37]
> >    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-snb1/igt@gem_userptr_blits@dmabuf-sync.html
> >    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-snb7/igt@gem_userptr_blits@dmabuf-sync.html
> > 
> >   * igt@gem_userptr_blits@sync-unmap-after-close:
> >     - shard-glk:          [DMESG-WARN][38] ([fdo#111870]) -> [PASS][39]
> >    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-glk7/igt@gem_userptr_blits@sync-unmap-after-close.html
> >    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-glk2/igt@gem_userptr_blits@sync-unmap-after-close.html
> > 
> >   * igt@gem_userptr_blits@sync-unmap-cycles:
> >     - shard-hsw:          [DMESG-WARN][40] ([fdo#111870]) -> [PASS][41]
> >    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw6/igt@gem_userptr_blits@sync-unmap-cycles.html
> >    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw7/igt@gem_userptr_blits@sync-unmap-cycles.html
> > 
> >   * igt@i915_pm_backlight@fade_with_suspend:
> >     - {shard-tglb}:       [INCOMPLETE][42] ([fdo#111832]) -> [PASS][43]
> >    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-tglb5/igt@i915_pm_backlight@fade_with_suspend.html
> >    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb4/igt@i915_pm_backlight@fade_with_suspend.html
> > 
> >   * igt@i915_selftest@live_hangcheck:
> >     - shard-hsw:          [DMESG-FAIL][44] ([fdo#111991]) -> [PASS][45]
> >    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-hsw6/igt@i915_selftest@live_hangcheck.html
> >    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-hsw8/igt@i915_selftest@live_hangcheck.html
> > 
> >   * igt@i915_suspend@fence-restore-tiled2untiled:
> >     - shard-apl:          [DMESG-WARN][46] ([fdo#108566]) -> [PASS][47] +5 similar issues
> >    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl1/igt@i915_suspend@fence-restore-tiled2untiled.html
> >    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl1/igt@i915_suspend@fence-restore-tiled2untiled.html
> > 
> >   * igt@kms_cursor_legacy@cursora-vs-flipa-legacy:
> >     - shard-iclb:         [INCOMPLETE][48] ([fdo#107713]) -> [PASS][49]
> >    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb7/igt@kms_cursor_legacy@cursora-vs-flipa-legacy.html
> >    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb6/igt@kms_cursor_legacy@cursora-vs-flipa-legacy.html
> > 
> >   * igt@kms_flip@flip-vs-expired-vblank-interruptible:
> >     - shard-skl:          [FAIL][50] ([fdo#105363]) -> [PASS][51]
> >    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> >    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> > 
> >   * igt@kms_flip@modeset-vs-vblank-race:
> >     - shard-glk:          [FAIL][52] ([fdo#111609]) -> [PASS][53]
> >    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-glk1/igt@kms_flip@modeset-vs-vblank-race.html
> >    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-glk4/igt@kms_flip@modeset-vs-vblank-race.html
> > 
> >   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
> >     - shard-iclb:         [FAIL][54] ([fdo#103167]) -> [PASS][55] +3 similar issues
> >    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> >    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> > 
> >   * igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu:
> >     - shard-skl:          [FAIL][56] ([fdo#103167]) -> [PASS][57]
> >    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-skl3/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html
> >    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-skl8/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html
> > 
> >   * igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
> >     - {shard-tglb}:       [INCOMPLETE][58] -> [PASS][59]
> >    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-tglb4/igt@kms_plane_multiple@atomic-pipe-c-tiling-y.html
> >    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-tglb6/igt@kms_plane_multiple@atomic-pipe-c-tiling-y.html
> > 
> >   * igt@kms_psr@psr2_cursor_render:
> >     - shard-iclb:         [SKIP][60] ([fdo#109441]) -> [PASS][61] +3 similar issues
> >    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb4/igt@kms_psr@psr2_cursor_render.html
> >    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
> > 
> >   * igt@kms_setmode@basic:
> >     - shard-apl:          [FAIL][62] ([fdo#99912]) -> [PASS][63]
> >    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-apl8/igt@kms_setmode@basic.html
> >    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-apl1/igt@kms_setmode@basic.html
> > 
> >   * igt@prime_busy@hang-bsd2:
> >     - shard-iclb:         [SKIP][64] ([fdo#109276]) -> [PASS][65] +12 similar issues
> >    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb5/igt@prime_busy@hang-bsd2.html
> >    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@prime_busy@hang-bsd2.html
> > 
> >   
> > #### Warnings ####
> > 
> >   * igt@gem_ctx_isolation@vcs1-nonpriv:
> >     - shard-iclb:         [FAIL][66] ([fdo#111329]) -> [SKIP][67] ([fdo#109276])
> >    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
> >    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv.html
> > 
> >   * igt@gem_mocs_settings@mocs-reset-bsd2:
> >     - shard-iclb:         [FAIL][68] ([fdo#111330]) -> [SKIP][69] ([fdo#109276])
> >    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html
> >    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb5/igt@gem_mocs_settings@mocs-reset-bsd2.html
> > 
> >   * igt@gem_mocs_settings@mocs-settings-bsd2:
> >     - shard-iclb:         [SKIP][70] ([fdo#109276]) -> [FAIL][71] ([fdo#111330]) +1 similar issue
> >    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7099/shard-iclb7/igt@gem_mocs_settings@mocs-settings-bsd2.html
> >    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/shard-iclb2/igt@gem_mocs_settings@mocs-settings-bsd2.html
> > 
> >   
> >   {name}: This element is suppressed. This means it is ignored when computing
> >           the status of the difference (SUCCESS, WARNING, or FAILURE).
> > 
> >   [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
> >   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
> >   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
> >   [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
> >   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
> >   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
> >   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
> >   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
> >   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
> >   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
> >   [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548
> >   [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
> >   [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
> >   [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#111609]: https://bugs.freedesktop.org/show_bug.cgi?id=111609
> >   [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
> >   [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850
> >   [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
> >   [fdo#111925]: https://bugs.freedesktop.org/show_bug.cgi?id=111925
> >   [fdo#111991]: https://bugs.freedesktop.org/show_bug.cgi?id=111991
> >   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> > 
> > 
> > Participating hosts (10 -> 11)
> > ------------------------------
> > 
> >   Additional (1): pig-skl-6260u 
> > 
> > 
> > Build changes
> > -------------
> > 
> >   * CI: CI-20190529 -> None
> >   * Linux: CI_DRM_7099 -> Patchwork_14822
> > 
> >   CI-20190529: 20190529
> >   CI_DRM_7099: fccd0abc9c05536751c60aabe5710c173fb8ffa6 @ git://anongit.freedesktop.org/gfx-ci/linux
> >   IGT_5231: e293051f8f99c72cb01d21e4b73a5928ea351eb3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
> >   Patchwork_14822: af8d69d10bd5974bdeea22eaf30e6e497728f916 @ git://anongit.freedesktop.org/gfx-ci/linux
> >   piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> > 
> > == Logs ==
> > 
> > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14822/index.html
> 
> -- 
> Matt Roper
> Graphics Software Engineer
> VTT-OSGC Platform Enablement
> Intel Corporation
> (916) 356-2795
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d20ca02d3166..de16576bb5fa 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2248,11 +2248,18 @@  static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 		tc_hotplug_trigger = pch_iir & SDE_TC_MASK_TGP;
 		tc_port_hotplug_long_detect = tgp_tc_port_hotplug_long_detect;
 		pins = hpd_tgp;
+	} else if (HAS_PCH_JSP(dev_priv)) {
+		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
+		tc_hotplug_trigger = 0;
+		pins = hpd_tgp;
 	} else if (HAS_PCH_MCC(dev_priv)) {
 		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
 		tc_hotplug_trigger = pch_iir & SDE_TC_HOTPLUG_ICP(PORT_TC1);
 		pins = hpd_icp;
 	} else {
+		WARN(!HAS_PCH_ICP(dev_priv),
+		     "Unrecognized PCH type 0x%x\n", INTEL_PCH_TYPE(dev_priv));
+
 		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
 		tc_hotplug_trigger = pch_iir & SDE_TC_MASK_ICP;
 		tc_port_hotplug_long_detect = icp_tc_port_hotplug_long_detect;
@@ -3373,15 +3380,19 @@  static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv,
 }
 
 /*
- * EHL doesn't need most of gen11_hpd_irq_setup, it's handling only the
+ * EHL/JSL don't need most of gen11_hpd_irq_setup, they're handling only the
  * equivalent of SDE.
+ *
+ * Note that MCC and JSP have different port C pin mappings, hence the use of
+ * ICP's table (hpd C on TC1) vs TGP's table (hpd C on DDIC) depending on
+ * platform.
  */
 static void mcc_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
 	icp_hpd_irq_setup(dev_priv,
 			  SDE_DDI_MASK_ICP, SDE_TC_HOTPLUG_ICP(PORT_TC1),
 			  ICP_DDI_HPD_ENABLE_MASK, ICP_TC_HPD_ENABLE(PORT_TC1),
-			  hpd_icp);
+			  HAS_PCH_JSP(dev_priv) ? hpd_tgp : hpd_icp);
 }
 
 static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv)
@@ -4315,7 +4326,7 @@  void intel_irq_init(struct drm_i915_private *dev_priv)
 		if (I915_HAS_HOTPLUG(dev_priv))
 			dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;
 	} else {
-		if (HAS_PCH_MCC(dev_priv))
+		if (HAS_PCH_MCC(dev_priv) || HAS_PCH_JSP(dev_priv))
 			dev_priv->display.hpd_irq_setup = mcc_hpd_irq_setup;
 		else if (INTEL_GEN(dev_priv) >= 11)
 			dev_priv->display.hpd_irq_setup = gen11_hpd_irq_setup;
diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
index 15f8bff141f9..1035d3d46fd8 100644
--- a/drivers/gpu/drm/i915/intel_pch.c
+++ b/drivers/gpu/drm/i915/intel_pch.c
@@ -79,7 +79,6 @@  intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 		WARN_ON(!IS_ICELAKE(dev_priv));
 		return PCH_ICP;
 	case INTEL_PCH_MCC_DEVICE_ID_TYPE:
-	case INTEL_PCH_MCC2_DEVICE_ID_TYPE:
 		DRM_DEBUG_KMS("Found Mule Creek Canyon PCH\n");
 		WARN_ON(!IS_ELKHARTLAKE(dev_priv));
 		return PCH_MCC;
@@ -87,6 +86,11 @@  intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 		DRM_DEBUG_KMS("Found Tiger Lake LP PCH\n");
 		WARN_ON(!IS_TIGERLAKE(dev_priv));
 		return PCH_TGP;
+	case INTEL_PCH_JSP_DEVICE_ID_TYPE:
+	case INTEL_PCH_JSP2_DEVICE_ID_TYPE:
+		DRM_DEBUG_KMS("Found Jasper Lake PCH\n");
+		WARN_ON(!IS_ELKHARTLAKE(dev_priv));
+		return PCH_JSP;
 	default:
 		return PCH_NONE;
 	}
diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h
index c29c81ec7971..f4dc18c34291 100644
--- a/drivers/gpu/drm/i915/intel_pch.h
+++ b/drivers/gpu/drm/i915/intel_pch.h
@@ -23,6 +23,7 @@  enum intel_pch {
 	PCH_SPT,        /* Sunrisepoint/Kaby Lake PCH */
 	PCH_CNP,        /* Cannon/Comet Lake PCH */
 	PCH_ICP,	/* Ice Lake PCH */
+	PCH_JSP,	/* Jasper Lake PCH */
 	PCH_MCC,        /* Mule Creek Canyon PCH */
 	PCH_TGP,	/* Tiger Lake PCH */
 };
@@ -44,14 +45,16 @@  enum intel_pch {
 #define INTEL_PCH_CMP2_DEVICE_ID_TYPE		0x0680
 #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
 #define INTEL_PCH_MCC_DEVICE_ID_TYPE		0x4B00
-#define INTEL_PCH_MCC2_DEVICE_ID_TYPE		0x3880
 #define INTEL_PCH_TGP_DEVICE_ID_TYPE		0xA080
+#define INTEL_PCH_JSP_DEVICE_ID_TYPE		0x4D80
+#define INTEL_PCH_JSP2_DEVICE_ID_TYPE		0x3880
 #define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
 #define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000
 #define INTEL_PCH_QEMU_DEVICE_ID_TYPE		0x2900 /* qemu q35 has 2918 */
 
 #define INTEL_PCH_TYPE(dev_priv)		((dev_priv)->pch_type)
 #define INTEL_PCH_ID(dev_priv)			((dev_priv)->pch_id)
+#define HAS_PCH_JSP(dev_priv)			(INTEL_PCH_TYPE(dev_priv) == PCH_JSP)
 #define HAS_PCH_MCC(dev_priv)			(INTEL_PCH_TYPE(dev_priv) == PCH_MCC)
 #define HAS_PCH_TGP(dev_priv)			(INTEL_PCH_TYPE(dev_priv) == PCH_TGP)
 #define HAS_PCH_ICP(dev_priv)			(INTEL_PCH_TYPE(dev_priv) == PCH_ICP)