diff mbox series

drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence

Message ID 20220113174826.50272-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence | expand

Commit Message

Souza, Jose Jan. 13, 2022, 5:48 p.m. UTC
TC voltage swing programming sequence was updated with a new step.

BSpec: 54956
Cc: stable@vger.kernel.org
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 22 ++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_reg.h          |  8 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

Comments

Clint Taylor Jan. 13, 2022, 7:14 p.m. UTC | #1
Matches BSPEC for DKL Phy.

Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com>

-Clint


On 1/13/22 9:48 AM, José Roberto de Souza wrote:
> TC voltage swing programming sequence was updated with a new step.
>
> BSpec: 54956
> Cc: stable@vger.kernel.org
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Clint Taylor <clinton.a.taylor@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_ddi.c | 22 ++++++++++++++++++++++
>   drivers/gpu/drm/i915/i915_reg.h          |  8 ++++++--
>   2 files changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 6ee0f77b79274..4e93eac926a56 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -1300,6 +1300,28 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder,
>   
>   		intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),
>   			     DKL_TX_DP20BITMODE, 0);
> +
> +		if (IS_ALDERLAKE_P(dev_priv)) {
> +			u32 val;
> +
> +			if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
> +				if (ln == 0) {
> +					val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
> +					val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(2);
> +				} else {
> +					val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(3);
> +					val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(3);
> +				}
> +			} else {
> +				val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
> +				val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(0);
> +			}
> +
> +			intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),
> +				     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK |
> +				     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK,
> +				     val);
> +		}
>   	}
>   }
>   
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 7c4013a0db615..ef6bc81800738 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -10085,8 +10085,12 @@ enum skl_power_gate {
>   						     _DKL_PHY2_BASE) + \
>   						     _DKL_TX_DPCNTL1)
>   
> -#define _DKL_TX_DPCNTL2				0x2C8
> -#define  DKL_TX_DP20BITMODE				(1 << 2)
> +#define _DKL_TX_DPCNTL2					0x2C8
> +#define  DKL_TX_DP20BITMODE				REG_BIT(2)
> +#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK	REG_GENMASK(4, 3)
> +#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(val)	REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK, (val))
> +#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK	REG_GENMASK(6, 5)
> +#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(val)	REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK, (val))
>   #define DKL_TX_DPCNTL2(tc_port) _MMIO(_PORT(tc_port, \
>   						     _DKL_PHY1_BASE, \
>   						     _DKL_PHY2_BASE) + \
Souza, Jose Jan. 13, 2022, 8:08 p.m. UTC | #2
On Thu, 2022-01-13 at 19:59 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence
URL:    https://patchwork.freedesktop.org/series/98853/
State:  success
Details:        https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/index.html
CI Bug Log - changes from CI_DRM_11079_full -> Patchwork_21997_full
Summary

SUCCESS

No regressions found.

pushed, thanks for the review Clint.

Participating hosts (10 -> 10)

No changes in participating hosts

Known issues

Here are the changes found in Patchwork_21997_full that come from known issues:

CI changes
Issues hit

  *   boot:
     *   shard-glk: (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/boot.html>) -> (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk2/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk1/boot.html>) ([i915#4392])

IGT changes
Issues hit

  *   igt@feature_discovery@psr2:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb2/igt@feature_discovery@psr2.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@feature_discovery@psr2.html> ([i915#658])
  *   igt@gem_eio@in-flight-immediate:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb5/igt@gem_eio@in-flight-immediate.html> -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb1/igt@gem_eio@in-flight-immediate.html> ([i915#3063])
  *   igt@gem_eio@unwedge-stress:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb3/igt@gem_eio@unwedge-stress.html> -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb2/igt@gem_eio@unwedge-stress.html> ([i915#2481] / [i915#3070])
  *   igt@gem_exec_balancer@parallel-keep-submit-fence:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb1/igt@gem_exec_balancer@parallel-keep-submit-fence.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb6/igt@gem_exec_balancer@parallel-keep-submit-fence.html> ([i915#4525])
  *   igt@gem_exec_fair@basic-deadline:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl5/igt@gem_exec_fair@basic-deadline.html> ([i915#2846])
  *   igt@gem_exec_fair@basic-none-rrul@rcs0:

     *   shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb1/igt@gem_exec_fair@basic-none-rrul@rcs0.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-none@vecs0:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl3/igt@gem_exec_fair@basic-none@vecs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl7/igt@gem_exec_fair@basic-none@vecs0.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-pace-share@rcs0:

     *   shard-tglb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-pace@vcs1:

     *   shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842]) +1 similar issue
  *   igt@gem_lmem_swapping@basic:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@gem_lmem_swapping@basic.html> ([fdo#109271] / [i915#4613])

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@gem_lmem_swapping@basic.html> ([fdo#109271] / [i915#4613]) +3 similar issues

  *   igt@gem_lmem_swapping@heavy-verify-random:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl4/igt@gem_lmem_swapping@heavy-verify-random.html> ([fdo#109271] / [i915#4613]) +2 similar issues
  *   igt@gem_pread@exhaustion:

     *   shard-skl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl5/igt@gem_pread@exhaustion.html> ([i915#2658])
  *   igt@gem_pwrite@basic-exhaustion:

     *   shard-kbl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@gem_pwrite@basic-exhaustion.html> ([i915#2658])

     *   shard-apl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@gem_pwrite@basic-exhaustion.html> ([i915#2658])

  *   igt@gem_pxp@reject-modify-context-protection-off-3:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@gem_pxp@reject-modify-context-protection-off-3.html> ([i915#4270])
  *   igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb1/igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled.html> ([i915#768])
  *   igt@gem_softpin@noreloc-s3:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk5/igt@gem_softpin@noreloc-s3.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk9/igt@gem_softpin@noreloc-s3.html> ([fdo#109271])
  *   igt@gem_userptr_blits@dmabuf-sync:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@gem_userptr_blits@dmabuf-sync.html> ([i915#3323])

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb2/igt@gem_userptr_blits@dmabuf-sync.html> ([i915#3323])

  *   igt@gen7_exec_parse@basic-offset:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@gen7_exec_parse@basic-offset.html> ([fdo#109271]) +20 similar issues
  *   igt@gen9_exec_parse@shadow-peek:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb2/igt@gen9_exec_parse@shadow-peek.html> ([i915#2527] / [i915#2856])

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@gen9_exec_parse@shadow-peek.html> ([i915#2856])

  *   igt@i915_pm_dc@dc6-dpms:

     *   shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@i915_pm_dc@dc6-dpms.html> ([i915#454])
  *   igt@i915_pm_rpm@modeset-pc8-residency-stress:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@i915_pm_rpm@modeset-pc8-residency-stress.html> ([fdo#109506] / [i915#2411])
  *   igt@i915_selftest@live@gt_pm:

     *   shard-skl: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl6/igt@i915_selftest@live@gt_pm.html> ([i915#1886] / [i915#2291])
  *   igt@kms_async_flips@crc:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl2/igt@kms_async_flips@crc.html> ([i915#4272])
  *   igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl4/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip.html> ([fdo#109271] / [i915#3777])
  *   igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl2/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html> ([i915#3743]) +2 similar issues
  *   igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl4/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html> ([fdo#109271] / [i915#3777]) +2 similar issues
  *   igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl2/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip.html> ([i915#3763]) +1 similar issue
  *   igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0.html> ([fdo#111615])
  *   igt@kms_busy@extended-modeset-hang-newfb:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl5/igt@kms_busy@extended-modeset-hang-newfb.html> ([fdo#109271]) +333 similar issues
  *   igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl7/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886]) +7 similar issues
  *   igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html> ([fdo#109278]) +2 similar issues
  *   igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +2 similar issues
  *   igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl4/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +14 similar issues
  *   igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs.html> ([fdo#111615] / [i915#3689])
  *   igt@kms_chamelium@hdmi-crc-fast:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@kms_chamelium@hdmi-crc-fast.html> ([fdo#109271] / [fdo#111827]) +2 similar issues
  *   igt@kms_chamelium@hdmi-mode-timings:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl7/igt@kms_chamelium@hdmi-mode-timings.html> ([fdo#109271] / [fdo#111827]) +10 similar issues
  *   igt@kms_chamelium@vga-hpd-after-suspend:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl5/igt@kms_chamelium@vga-hpd-after-suspend.html> ([fdo#109271] / [fdo#111827]) +22 similar issues
  *   igt@kms_color_chamelium@pipe-b-ctm-0-75:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_color_chamelium@pipe-b-ctm-0-75.html> ([fdo#109284] / [fdo#111827]) +1 similar issue
  *   igt@kms_color_chamelium@pipe-d-ctm-red-to-blue:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@kms_color_chamelium@pipe-d-ctm-red-to-blue.html> ([fdo#109278] / [fdo#109284] / [fdo#111827])
  *   igt@kms_content_protection@lic:

     *   shard-kbl: NOTRUN -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@kms_content_protection@lic.html> ([i915#1319])
  *   igt@kms_cursor_crc@pipe-a-cursor-suspend:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> ([i915#180]) +6 similar issues
  *   igt@kms_cursor_crc@pipe-b-cursor-32x10-sliding:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-32x10-sliding.html> ([i915#3359]) +5 similar issues
  *   igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen.html> ([fdo#109279] / [i915#3359])
  *   igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346])
  *   igt@kms_flip@2x-flip-vs-panning-interruptible:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@kms_flip@2x-flip-vs-panning-interruptible.html> ([fdo#109274])

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb2/igt@kms_flip@2x-flip-vs-panning-interruptible.html> ([fdo#109274] / [fdo#111825])

  *   igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> ([i915#79])
  *   igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> ([i915#180]) +4 similar issues
  *   igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html> ([i915#2122]) +2 similar issues
  *   igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling:

     *   shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl5/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html> ([i915#3701])
  *   igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html> ([i915#2587])

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb5/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html> ([i915#3701])

  *   igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt.html> ([fdo#109280] / [fdo#111825]) +2 similar issues
  *   igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-gtt:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb1/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-gtt.html> ([fdo#109280])
  *   igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:

     *   shard-kbl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html> ([i915#180]) +1 similar issue
  *   igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d.html> ([fdo#109271] / [i915#533]) +6 similar issues
  *   igt@kms_plane_alpha_blend@pipe-b-alpha-basic:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl3/igt@kms_plane_alpha_blend@pipe-b-alpha-basic.html> ([fdo#108145] / [i915#265]) +2 similar issues
  *   igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:

     *   shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@kms_plane_alpha_blend@pipe-c-alpha-7efc.html> ([fdo#108145] / [i915#265]) +1 similar issue

     *   shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@kms_plane_alpha_blend@pipe-c-alpha-7efc.html> ([fdo#108145] / [i915#265])

  *   igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl2/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html> ([fdo#109271] / [i915#2733])
  *   igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl4/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html> ([fdo#109271] / [i915#658])
  *   igt@kms_psr2_sf@plane-move-sf-dmg-area:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl7/igt@kms_psr2_sf@plane-move-sf-dmg-area.html> ([fdo#109271] / [i915#658])
  *   igt@kms_psr@psr2_cursor_blt:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@kms_psr@psr2_cursor_blt.html> ([fdo#109441]) +1 similar issue
  *   igt@kms_psr@psr2_sprite_plane_onoff:

     *   shard-tglb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@kms_psr@psr2_sprite_plane_onoff.html> ([i915#132] / [i915#3467])
  *   igt@kms_writeback@writeback-pixel-formats:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl4/igt@kms_writeback@writeback-pixel-formats.html> ([fdo#109271] / [i915#2437]) +2 similar issues

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl7/igt@kms_writeback@writeback-pixel-formats.html> ([fdo#109271] / [i915#2437]) +1 similar issue

  *   igt@perf@polling-small-buf:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@perf@polling-small-buf.html> ([i915#1722])
  *   igt@prime_nv_pcopy@test2:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl7/igt@prime_nv_pcopy@test2.html> ([fdo#109271]) +143 similar issues
  *   igt@prime_nv_pcopy@test_semaphore:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@prime_nv_pcopy@test_semaphore.html> ([fdo#109291])
  *   igt@sysfs_clients@fair-0:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@sysfs_clients@fair-0.html> ([fdo#109271] / [i915#2994]) +3 similar issues

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-apl4/igt@sysfs_clients@fair-0.html> ([fdo#109271] / [i915#2994])

  *   igt@sysfs_clients@recycle-many:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@sysfs_clients@recycle-many.html> ([i915#2994])
  *   igt@sysfs_clients@split-25:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl4/igt@sysfs_clients@split-25.html> ([fdo#109271] / [i915#2994]) +2 similar issues

Possible fixes

  *   igt@gem_exec_balancer@parallel-contexts:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb8/igt@gem_exec_balancer@parallel-contexts.html> ([i915#4525]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb4/igt@gem_exec_balancer@parallel-contexts.html> +1 similar issue
  *   igt@gem_exec_capture@pi@vcs0:

     *   shard-skl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl4/igt@gem_exec_capture@pi@vcs0.html> ([i915#4547]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl10/igt@gem_exec_capture@pi@vcs0.html>
  *   igt@gem_exec_fair@basic-none-vip@rcs0:

     *   shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl7/igt@gem_exec_fair@basic-none-vip@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-kbl1/igt@gem_exec_fair@basic-none-vip@rcs0.html>
  *   igt@gem_exec_fair@basic-none@vcs0:

     *   shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/igt@gem_exec_fair@basic-none@vcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk8/igt@gem_exec_fair@basic-none@vcs0.html> +1 similar issue
  *   igt@gem_exec_fair@basic-throttle@rcs0:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb3/igt@gem_exec_fair@basic-throttle@rcs0.html>
  *   igt@gem_exec_whisper@basic-forked:

     *   shard-glk: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk7/igt@gem_exec_whisper@basic-forked.html> ([i915#118]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-glk6/igt@gem_exec_whisper@basic-forked.html>
  *   igt@gen9_exec_parse@allowed-single:

     *   shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl8/igt@gen9_exec_parse@allowed-single.html> ([i915#1436] / [i915#716]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@gen9_exec_parse@allowed-single.html>
  *   igt@i915_pm_dc@dc6-dpms:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html> ([i915#454]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb5/igt@i915_pm_dc@dc6-dpms.html>
  *   igt@i915_pm_rpm@cursor-dpms:

     *   shard-tglb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb6/igt@i915_pm_rpm@cursor-dpms.html> ([i915#2411]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb5/igt@i915_pm_rpm@cursor-dpms.html>
  *   igt@i915_pm_rpm@gem-mmap-type@gtt:

     *   shard-iclb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb4/igt@i915_pm_rpm@gem-mmap-type@gtt.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-iclb1/igt@i915_pm_rpm@gem-mmap-type@gtt.html>
  *   igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:

     *   shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-tglb8/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html>
  *   igt@kms_flip@flip-vs-expired-vblank@a-edp1:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21997/shard-skl9/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html>
  *   igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:

     *   shard-glk: [FAIL]
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 6ee0f77b79274..4e93eac926a56 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1300,6 +1300,28 @@  static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder,
 
 		intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),
 			     DKL_TX_DP20BITMODE, 0);
+
+		if (IS_ALDERLAKE_P(dev_priv)) {
+			u32 val;
+
+			if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
+				if (ln == 0) {
+					val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
+					val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(2);
+				} else {
+					val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(3);
+					val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(3);
+				}
+			} else {
+				val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
+				val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(0);
+			}
+
+			intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),
+				     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK |
+				     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK,
+				     val);
+		}
 	}
 }
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 7c4013a0db615..ef6bc81800738 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -10085,8 +10085,12 @@  enum skl_power_gate {
 						     _DKL_PHY2_BASE) + \
 						     _DKL_TX_DPCNTL1)
 
-#define _DKL_TX_DPCNTL2				0x2C8
-#define  DKL_TX_DP20BITMODE				(1 << 2)
+#define _DKL_TX_DPCNTL2					0x2C8
+#define  DKL_TX_DP20BITMODE				REG_BIT(2)
+#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK	REG_GENMASK(4, 3)
+#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(val)	REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK, (val))
+#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK	REG_GENMASK(6, 5)
+#define  DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(val)	REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK, (val))
 #define DKL_TX_DPCNTL2(tc_port) _MMIO(_PORT(tc_port, \
 						     _DKL_PHY1_BASE, \
 						     _DKL_PHY2_BASE) + \