diff mbox series

[v2,1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+

Message ID 20191125125313.17584-1-kai.vehmanen@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [v2,1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+ | expand

Commit Message

Kai Vehmanen Nov. 25, 2019, 12:53 p.m. UTC
Starting with gen12, PORT_A can be connected to a transcoder
with audio support. Modify the existing logic that disabled
audio on PORT_A unconditionally.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Comments

Kai Vehmanen Nov. 26, 2019, 8:24 a.m. UTC | #1
Hey,

On Tue, 26 Nov 2019, Patchwork wrote:
> Series: series starting with [v2,1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+
> URL   : https://patchwork.freedesktop.org/series/69982/
[...]
>     - shard-skl:          [PASS][1] -> [FAIL][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl9/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl3/igt@gem_ppgtt@flink-and-close-vma-leak.html

it seems the failure is hit without my patch 
as well, e.g. here today:

https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-apl6/igt@gem_ppgtt@flink-and-close-vma-leak.html

Br, Kai
Matt Roper Nov. 27, 2019, 12:10 a.m. UTC | #2
On Mon, Nov 25, 2019 at 02:53:12PM +0200, Kai Vehmanen wrote:
> Starting with gen12, PORT_A can be connected to a transcoder
> with audio support. Modify the existing logic that disabled
> audio on PORT_A unconditionally.
> 
> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 9b15ac4f2fb6..4519c32f6c24 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2237,6 +2237,17 @@ bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,
>  	}
>  }
>  
> +static bool intel_dp_port_has_audio(struct drm_i915_private *dev_priv,
> +				    enum port port)
> +{
> +	if (IS_G4X(dev_priv))
> +		return false;
> +	if (INTEL_GEN(dev_priv) < 12 && port == PORT_A)
> +		return false;
> +
> +	return true;
> +}
> +
>  int
>  intel_dp_compute_config(struct intel_encoder *encoder,
>  			struct intel_crtc_state *pipe_config,
> @@ -2269,7 +2280,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  		return ret;
>  
>  	pipe_config->has_drrs = false;
> -	if (IS_G4X(dev_priv) || port == PORT_A)
> +	if (!intel_dp_port_has_audio(dev_priv, port))
>  		pipe_config->has_audio = false;
>  	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
>  		pipe_config->has_audio = intel_dp->has_audio;
> -- 
> 2.17.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Matt Roper Nov. 27, 2019, 12:15 a.m. UTC | #3
On Tue, Nov 26, 2019 at 02:03:08AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [v2,1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+
> URL   : https://patchwork.freedesktop.org/series/69982/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7418_full -> Patchwork_15423_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_15423_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_15423_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_15423_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-skl:          [PASS][1] -> [FAIL][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl9/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl3/igt@gem_ppgtt@flink-and-close-vma-leak.html
> 
>   * igt@kms_big_fb@y-tiled-32bpp-rotate-270:
>     - shard-tglb:         [PASS][3] -> [INCOMPLETE][4]
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb2/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb4/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
> 
>   * igt@kms_draw_crc@draw-method-xrgb2101010-render-xtiled:
>     - shard-skl:          [PASS][5] -> [INCOMPLETE][6] +4 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl3/igt@kms_draw_crc@draw-method-xrgb2101010-render-xtiled.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl1/igt@kms_draw_crc@draw-method-xrgb2101010-render-xtiled.html
> 
>   * igt@perf@oa-exponents:
>     - shard-kbl:          [PASS][7] -> [TIMEOUT][8]
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-kbl1/igt@perf@oa-exponents.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-kbl6/igt@perf@oa-exponents.html
> 
>   * igt@runner@aborted:
>     - shard-kbl:          NOTRUN -> [FAIL][9]
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-kbl6/igt@runner@aborted.html

None of these failures appear to be related to this series.

Applied #1 to dinq.  Thanks for the patch.


Matt

> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_15423_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_busy@busy-vcs1:
>     - shard-iclb:         [PASS][10] -> [SKIP][11] ([fdo#112080]) +10 similar issues
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb4/igt@gem_busy@busy-vcs1.html
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb5/igt@gem_busy@busy-vcs1.html
> 
>   * igt@gem_ctx_isolation@rcs0-s3:
>     - shard-tglb:         [PASS][12] -> [INCOMPLETE][13] ([fdo#111832])
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb8/igt@gem_ctx_isolation@rcs0-s3.html
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb2/igt@gem_ctx_isolation@rcs0-s3.html
> 
>   * igt@gem_ctx_isolation@vecs0-s3:
>     - shard-iclb:         [PASS][14] -> [DMESG-WARN][15] ([fdo#111764])
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb5/igt@gem_ctx_isolation@vecs0-s3.html
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb8/igt@gem_ctx_isolation@vecs0-s3.html
> 
>   * igt@gem_exec_schedule@out-order-bsd1:
>     - shard-iclb:         [PASS][16] -> [SKIP][17] ([fdo#109276]) +5 similar issues
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb2/igt@gem_exec_schedule@out-order-bsd1.html
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb5/igt@gem_exec_schedule@out-order-bsd1.html
> 
>   * igt@gem_exec_schedule@preemptive-hang-bsd:
>     - shard-iclb:         [PASS][18] -> [SKIP][19] ([fdo#112146]) +4 similar issues
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb8/igt@gem_exec_schedule@preemptive-hang-bsd.html
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html
> 
>   * igt@i915_pm_dc@dc6-psr:
>     - shard-iclb:         [PASS][20] -> [FAIL][21] ([fdo#111830 ])
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@i915_pm_dc@dc6-psr.html
> 
>   * igt@i915_pm_rpm@system-suspend-execbuf:
>     - shard-skl:          [PASS][22] -> [INCOMPLETE][23] ([fdo#104108] / [fdo#107807])
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl8/igt@i915_pm_rpm@system-suspend-execbuf.html
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl8/igt@i915_pm_rpm@system-suspend-execbuf.html
> 
>   * igt@i915_selftest@live_hangcheck:
>     - shard-snb:          [PASS][24] -> [INCOMPLETE][25] ([fdo#105411])
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-snb4/igt@i915_selftest@live_hangcheck.html
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-snb1/igt@i915_selftest@live_hangcheck.html
> 
>   * igt@kms_atomic_transition@plane-all-transition:
>     - shard-tglb:         [PASS][26] -> [DMESG-WARN][27] ([fdo#111600])
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb7/igt@kms_atomic_transition@plane-all-transition.html
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb7/igt@kms_atomic_transition@plane-all-transition.html
> 
>   * igt@kms_big_fb@x-tiled-64bpp-rotate-180:
>     - shard-skl:          [PASS][28] -> [INCOMPLETE][29] ([fdo#112347])
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl4/igt@kms_big_fb@x-tiled-64bpp-rotate-180.html
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl7/igt@kms_big_fb@x-tiled-64bpp-rotate-180.html
> 
>   * igt@kms_color@pipe-a-ctm-0-25:
>     - shard-skl:          [PASS][30] -> [DMESG-WARN][31] ([fdo#106107])
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl2/igt@kms_color@pipe-a-ctm-0-25.html
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl2/igt@kms_color@pipe-a-ctm-0-25.html
> 
>   * igt@kms_cursor_crc@pipe-b-cursor-suspend:
>     - shard-skl:          [PASS][32] -> [INCOMPLETE][33] ([fdo#110741])
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
>     - shard-iclb:         [PASS][34] -> [FAIL][35] ([fdo#103167]) +3 similar issues
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt:
>     - shard-tglb:         [PASS][36] -> [FAIL][37] ([fdo#103167]) +3 similar issues
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
> 
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
>     - shard-tglb:         [PASS][38] -> [INCOMPLETE][39] ([fdo#111832] / [fdo#111850]) +2 similar issues
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
> 
>   * igt@kms_psr2_su@frontbuffer:
>     - shard-iclb:         [PASS][40] -> [SKIP][41] ([fdo#109642] / [fdo#111068])
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb5/igt@kms_psr2_su@frontbuffer.html
> 
>   * igt@kms_psr@psr2_primary_mmap_gtt:
>     - shard-iclb:         [PASS][42] -> [SKIP][43] ([fdo#109441])
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb5/igt@kms_psr@psr2_primary_mmap_gtt.html
> 
>   * igt@kms_vblank@pipe-a-ts-continuation-suspend:
>     - shard-kbl:          [PASS][44] -> [DMESG-WARN][45] ([fdo#108566]) +11 similar issues
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-kbl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
> 
>   * igt@kms_vblank@pipe-d-ts-continuation-dpms-suspend:
>     - shard-tglb:         [PASS][46] -> [INCOMPLETE][47] ([fdo#111850])
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb8/igt@kms_vblank@pipe-d-ts-continuation-dpms-suspend.html
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb2/igt@kms_vblank@pipe-d-ts-continuation-dpms-suspend.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@debugfs_test@read_all_entries_display_on:
>     - shard-skl:          [DMESG-WARN][48] ([fdo#106107]) -> [PASS][49]
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl7/igt@debugfs_test@read_all_entries_display_on.html
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl5/igt@debugfs_test@read_all_entries_display_on.html
> 
>   * igt@gem_ctx_isolation@bcs0-s3:
>     - shard-tglb:         [INCOMPLETE][50] ([fdo#111832]) -> [PASS][51]
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb2/igt@gem_ctx_isolation@bcs0-s3.html
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb9/igt@gem_ctx_isolation@bcs0-s3.html
> 
>   * igt@gem_ctx_persistence@vcs1-mixed-process:
>     - shard-iclb:         [SKIP][52] ([fdo#109276] / [fdo#112080]) -> [PASS][53] +1 similar issue
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb8/igt@gem_ctx_persistence@vcs1-mixed-process.html
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb1/igt@gem_ctx_persistence@vcs1-mixed-process.html
> 
>   * igt@gem_ctx_shared@single-timeline:
>     - shard-kbl:          [FAIL][54] -> [PASS][55]
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-kbl6/igt@gem_ctx_shared@single-timeline.html
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-kbl1/igt@gem_ctx_shared@single-timeline.html
> 
>   * igt@gem_exec_parallel@vcs1-fds:
>     - shard-iclb:         [SKIP][56] ([fdo#112080]) -> [PASS][57] +6 similar issues
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb3/igt@gem_exec_parallel@vcs1-fds.html
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@gem_exec_parallel@vcs1-fds.html
> 
>   * igt@gem_exec_schedule@preempt-hang-bsd:
>     - shard-iclb:         [SKIP][58] ([fdo#112146]) -> [PASS][59]
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb2/igt@gem_exec_schedule@preempt-hang-bsd.html
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb5/igt@gem_exec_schedule@preempt-hang-bsd.html
> 
>   * igt@gem_persistent_relocs@forked-thrashing:
>     - shard-snb:          [FAIL][60] ([fdo#112037]) -> [PASS][61]
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-snb2/igt@gem_persistent_relocs@forked-thrashing.html
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-snb6/igt@gem_persistent_relocs@forked-thrashing.html
> 
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-apl:          [FAIL][62] -> [PASS][63]
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-apl6/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-apl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-busy:
>     - shard-snb:          [DMESG-WARN][64] ([fdo#111870]) -> [PASS][65] +1 similar issue
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-snb6/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-snb1/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>     - shard-hsw:          [DMESG-WARN][66] ([fdo#111870]) -> [PASS][67]
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-hsw5/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-hsw7/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-glk:          [INCOMPLETE][68] ([fdo#103359] / [k.org#198133]) -> [PASS][69]
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-glk2/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-glk4/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@kms_big_fb@x-tiled-8bpp-rotate-180:
>     - shard-tglb:         [INCOMPLETE][70] -> [PASS][71]
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb1/igt@kms_big_fb@x-tiled-8bpp-rotate-180.html
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb5/igt@kms_big_fb@x-tiled-8bpp-rotate-180.html
> 
>   * igt@kms_cursor_crc@pipe-a-cursor-suspend:
>     - shard-kbl:          [DMESG-WARN][72] ([fdo#108566]) -> [PASS][73] +3 similar issues
>    [72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-kbl2/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
>    [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
> 
>   * igt@kms_flip@plain-flip-ts-check-interruptible:
>     - shard-skl:          [FAIL][74] ([fdo#100368]) -> [PASS][75]
>    [74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible.html
>    [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
>     - shard-iclb:         [INCOMPLETE][76] ([fdo#107713]) -> [PASS][77]
>    [76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
>    [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
>     - shard-tglb:         [FAIL][78] ([fdo#103167]) -> [PASS][79]
>    [78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
>    [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render:
>     - shard-iclb:         [FAIL][80] ([fdo#103167]) -> [PASS][81]
>    [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render.html
>    [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render.html
> 
>   * igt@kms_frontbuffer_tracking@psr-shrfb-scaledprimary:
>     - shard-skl:          [INCOMPLETE][82] ([fdo#106978]) -> [PASS][83]
>    [82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl7/igt@kms_frontbuffer_tracking@psr-shrfb-scaledprimary.html
>    [83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl3/igt@kms_frontbuffer_tracking@psr-shrfb-scaledprimary.html
> 
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
>     - shard-tglb:         [INCOMPLETE][84] ([fdo#111832] / [fdo#111850]) -> [PASS][85]
>    [84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-tglb2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
>    [85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-tglb6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
> 
>   * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
>     - shard-skl:          [FAIL][86] ([fdo#108145]) -> [PASS][87]
>    [86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl3/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
>    [87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
> 
>   * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>     - shard-skl:          [FAIL][88] ([fdo#108145] / [fdo#110403]) -> [PASS][89]
>    [88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
>    [89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
> 
>   * igt@kms_psr@psr2_sprite_plane_move:
>     - shard-iclb:         [SKIP][90] ([fdo#109441]) -> [PASS][91] +2 similar issues
>    [90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
>    [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
> 
>   * igt@kms_vblank@pipe-c-ts-continuation-suspend:
>     - shard-skl:          [INCOMPLETE][92] ([fdo#104108]) -> [PASS][93]
>    [92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-skl5/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
>    [93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-skl7/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
> 
>   * igt@perf@disabled-read-error:
>     - shard-hsw:          [INCOMPLETE][94] ([fdo#103540]) -> [PASS][95]
>    [94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-hsw2/igt@perf@disabled-read-error.html
>    [95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-hsw5/igt@perf@disabled-read-error.html
> 
>   * igt@prime_vgem@fence-wait-bsd2:
>     - shard-iclb:         [SKIP][96] ([fdo#109276]) -> [PASS][97] +13 similar issues
>    [96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb3/igt@prime_vgem@fence-wait-bsd2.html
>    [97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb2/igt@prime_vgem@fence-wait-bsd2.html
> 
>   
> #### Warnings ####
> 
>   * igt@runner@aborted:
>     - shard-iclb:         ([FAIL][98], [FAIL][99], [FAIL][100]) ([fdo#109263] / [fdo#111093]) -> [FAIL][101] ([fdo#111093])
>    [98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb2/igt@runner@aborted.html
>    [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb1/igt@runner@aborted.html
>    [100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7418/shard-iclb5/igt@runner@aborted.html
>    [101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/shard-iclb8/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#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
>   [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#107807]: https://bugs.fre
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15423/index.html
> _______________________________________________
> 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/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 9b15ac4f2fb6..4519c32f6c24 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2237,6 +2237,17 @@  bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,
 	}
 }
 
+static bool intel_dp_port_has_audio(struct drm_i915_private *dev_priv,
+				    enum port port)
+{
+	if (IS_G4X(dev_priv))
+		return false;
+	if (INTEL_GEN(dev_priv) < 12 && port == PORT_A)
+		return false;
+
+	return true;
+}
+
 int
 intel_dp_compute_config(struct intel_encoder *encoder,
 			struct intel_crtc_state *pipe_config,
@@ -2269,7 +2280,7 @@  intel_dp_compute_config(struct intel_encoder *encoder,
 		return ret;
 
 	pipe_config->has_drrs = false;
-	if (IS_G4X(dev_priv) || port == PORT_A)
+	if (!intel_dp_port_has_audio(dev_priv, port))
 		pipe_config->has_audio = false;
 	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
 		pipe_config->has_audio = intel_dp->has_audio;