diff mbox series

[CI,1/3] drm/i915: Handle SDEISR according to PCH rather than platform

Message ID 20191127221314.575575-1-matthew.d.roper@intel.com (mailing list archive)
State New, archived
Headers show
Series [CI,1/3] drm/i915: Handle SDEISR according to PCH rather than platform | expand

Commit Message

Matt Roper Nov. 27, 2019, 10:13 p.m. UTC 
The South Display is part of the PCH so we should technically be basing
our port detection logic off the PCH in use rather than the platform
generation.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Matt Roper Dec. 2, 2019, 4:20 p.m. UTC | #1 
On Fri, Nov 29, 2019 at 04:17:45AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [CI,1/3] drm/i915: Handle SDEISR according to PCH rather than platform
> URL   : https://patchwork.freedesktop.org/series/70130/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7434_full -> Patchwork_15476_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_15476_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_15476_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_15476_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@kms_plane@pixel-format-pipe-a-planes:
>     - shard-skl:          NOTRUN -> [INCOMPLETE][1]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl5/igt@kms_plane@pixel-format-pipe-a-planes.html

Log output appears to cut off in the middle of a test; not sure what
happened.  But the second two patches in this series aren't relevant to
shard-skl and any problems in the first patch would have showed up
before this point and on other KMS IGT's, so this incomplete doesn't
appear to have been caused by this series.

Series applied to dinq.  Thanks Jose and Lucas for the reviews.


Matt

> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * {igt@gem_exec_balancer@bonded-chain}:
>     - shard-tglb:         NOTRUN -> [FAIL][2]
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb2/igt@gem_exec_balancer@bonded-chain.html
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_15476_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_busy@busy-vcs1:
>     - shard-iclb:         [PASS][3] -> [SKIP][4] ([fdo#112080]) +9 similar issues
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@gem_busy@busy-vcs1.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb8/igt@gem_busy@busy-vcs1.html
> 
>   * igt@gem_ctx_isolation@vcs1-none:
>     - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#109276] / [fdo#112080]) +2 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb4/igt@gem_ctx_isolation@vcs1-none.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb8/igt@gem_ctx_isolation@vcs1-none.html
> 
>   * igt@gem_ctx_isolation@vecs0-s3:
>     - shard-skl:          [PASS][7] -> [INCOMPLETE][8] ([fdo#104108]) +1 similar issue
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl6/igt@gem_ctx_isolation@vecs0-s3.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl10/igt@gem_ctx_isolation@vecs0-s3.html
> 
>   * igt@gem_ctx_switch@queue-light:
>     - shard-tglb:         [PASS][9] -> [INCOMPLETE][10] ([fdo#111672])
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb5/igt@gem_ctx_switch@queue-light.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb3/igt@gem_ctx_switch@queue-light.html
> 
>   * igt@gem_eio@suspend:
>     - shard-tglb:         [PASS][11] -> [INCOMPLETE][12] ([fdo#111850])
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@gem_eio@suspend.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb7/igt@gem_eio@suspend.html
> 
>   * igt@gem_exec_parallel@vcs1-contexts:
>     - shard-tglb:         [PASS][13] -> [INCOMPLETE][14] ([fdo#111747]) +1 similar issue
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb9/igt@gem_exec_parallel@vcs1-contexts.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb4/igt@gem_exec_parallel@vcs1-contexts.html
> 
>   * igt@gem_exec_suspend@basic-s3:
>     - shard-kbl:          [PASS][15] -> [DMESG-WARN][16] ([fdo#108566]) +1 similar issue
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl1/igt@gem_exec_suspend@basic-s3.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-kbl7/igt@gem_exec_suspend@basic-s3.html
> 
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-glk:          [PASS][17] -> [FAIL][18] ([fdo#112392])
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
>     - shard-apl:          [PASS][19] -> [FAIL][20] ([fdo#112392])
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl7/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-apl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
> 
>   * igt@gem_pread@snoop:
>     - shard-glk:          [PASS][21] -> [INCOMPLETE][22] ([fdo#103359] / [k.org#198133])
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk8/igt@gem_pread@snoop.html
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-glk6/igt@gem_pread@snoop.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-apl:          [PASS][23] -> [INCOMPLETE][24] ([fdo#103927])
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl4/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-apl7/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@i915_pm_rpm@system-suspend:
>     - shard-tglb:         [PASS][25] -> [INCOMPLETE][26] ([fdo#111747] / [fdo#111850])
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@i915_pm_rpm@system-suspend.html
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb2/igt@i915_pm_rpm@system-suspend.html
> 
>   * igt@kms_big_fb@y-tiled-8bpp-rotate-0:
>     - shard-kbl:          [PASS][27] -> [INCOMPLETE][28] ([fdo#103665])
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl1/igt@kms_big_fb@y-tiled-8bpp-rotate-0.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-kbl4/igt@kms_big_fb@y-tiled-8bpp-rotate-0.html
> 
>   * igt@kms_big_fb@yf-tiled-32bpp-rotate-270:
>     - shard-skl:          [PASS][29] -> [INCOMPLETE][30] ([fdo#112347])
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl9/igt@kms_big_fb@yf-tiled-32bpp-rotate-270.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl3/igt@kms_big_fb@yf-tiled-32bpp-rotate-270.html
> 
>   * igt@kms_cursor_crc@pipe-a-cursor-suspend:
>     - shard-apl:          [PASS][31] -> [DMESG-WARN][32] ([fdo#108566]) +2 similar issues
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl3/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-apl6/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
>     - shard-iclb:         [PASS][33] -> [FAIL][34] ([fdo#103167]) +4 similar issues
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu:
>     - shard-tglb:         [PASS][35] -> [INCOMPLETE][36] ([fdo#111884])
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt:
>     - shard-skl:          [PASS][37] -> [INCOMPLETE][38] ([fdo#106978])
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html
> 
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
>     - shard-tglb:         [PASS][39] -> [INCOMPLETE][40] ([fdo#111832] / [fdo#111850]) +2 similar issues
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
> 
>   * igt@kms_psr@psr2_cursor_blt:
>     - shard-iclb:         [PASS][41] -> [SKIP][42] ([fdo#109441]) +1 similar issue
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb4/igt@kms_psr@psr2_cursor_blt.html
> 
>   * igt@kms_setmode@basic:
>     - shard-hsw:          [PASS][43] -> [FAIL][44] ([fdo#99912])
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw1/igt@kms_setmode@basic.html
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-hsw2/igt@kms_setmode@basic.html
> 
>   * igt@prime_vgem@fence-wait-bsd2:
>     - shard-iclb:         [PASS][45] -> [SKIP][46] ([fdo#109276]) +9 similar issues
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb4/igt@prime_vgem@fence-wait-bsd2.html
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb8/igt@prime_vgem@fence-wait-bsd2.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_ctx_isolation@rcs0-s3:
>     - shard-kbl:          [DMESG-WARN][47] ([fdo#108566]) -> [PASS][48] +9 similar issues
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl7/igt@gem_ctx_isolation@rcs0-s3.html
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-kbl6/igt@gem_ctx_isolation@rcs0-s3.html
>     - shard-tglb:         [INCOMPLETE][49] ([fdo#111832]) -> [PASS][50]
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb9/igt@gem_ctx_isolation@rcs0-s3.html
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb9/igt@gem_ctx_isolation@rcs0-s3.html
> 
>   * igt@gem_ctx_persistence@smoketest:
>     - shard-glk:          [TIMEOUT][51] ([fdo#112404]) -> [PASS][52]
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk8/igt@gem_ctx_persistence@smoketest.html
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-glk1/igt@gem_ctx_persistence@smoketest.html
> 
>   * igt@gem_ctx_shared@q-smoketest-bsd:
>     - shard-tglb:         [INCOMPLETE][53] ([fdo# 111852 ]) -> [PASS][54]
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb9/igt@gem_ctx_shared@q-smoketest-bsd.html
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb9/igt@gem_ctx_shared@q-smoketest-bsd.html
> 
>   * igt@gem_ctx_switch@all-light:
>     - shard-tglb:         [INCOMPLETE][55] ([fdo#111672]) -> [PASS][56]
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@gem_ctx_switch@all-light.html
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb1/igt@gem_ctx_switch@all-light.html
> 
>   * igt@gem_ctx_switch@vcs1:
>     - shard-iclb:         [SKIP][57] ([fdo#112080]) -> [PASS][58] +5 similar issues
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb6/igt@gem_ctx_switch@vcs1.html
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb4/igt@gem_ctx_switch@vcs1.html
> 
>   * igt@gem_eio@in-flight-suspend:
>     - shard-skl:          [INCOMPLETE][59] ([fdo#104108]) -> [PASS][60] +1 similar issue
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl8/igt@gem_eio@in-flight-suspend.html
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl4/igt@gem_eio@in-flight-suspend.html
> 
>   * igt@gem_exec_schedule@preempt-hang-bsd2:
>     - shard-iclb:         [SKIP][61] ([fdo#109276]) -> [PASS][62]
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb6/igt@gem_exec_schedule@preempt-hang-bsd2.html
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb4/igt@gem_exec_schedule@preempt-hang-bsd2.html
> 
>   * igt@gem_exec_schedule@preempt-queue-chain-vebox:
>     - shard-tglb:         [INCOMPLETE][63] ([fdo#111677]) -> [PASS][64]
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@gem_exec_schedule@preempt-queue-chain-vebox.html
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb7/igt@gem_exec_schedule@preempt-queue-chain-vebox.html
> 
>   * igt@gem_exec_schedule@preempt-self-bsd:
>     - shard-iclb:         [SKIP][65] ([fdo#112146]) -> [PASS][66]
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb4/igt@gem_exec_schedule@preempt-self-bsd.html
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb3/igt@gem_exec_schedule@preempt-self-bsd.html
> 
>   * igt@gem_sync@basic-store-all:
>     - shard-tglb:         [INCOMPLETE][67] ([fdo#111880]) -> [PASS][68]
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@gem_sync@basic-store-all.html
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb7/igt@gem_sync@basic-store-all.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-kbl:          [INCOMPLETE][69] ([fdo#103665]) -> [PASS][70]
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl6/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-kbl6/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@kms_big_fb@y-tiled-32bpp-rotate-270:
>     - shard-glk:          [INCOMPLETE][71] ([fdo#103359] / [k.org#198133]) -> [PASS][72]
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk7/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
>    [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-glk3/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
> 
>   * igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
>     - shard-glk:          [FAIL][73] ([fdo#107409]) -> [PASS][74]
>    [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk9/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
>    [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-glk6/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
> 
>   * igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled:
>     - shard-tglb:         [INCOMPLETE][75] ([fdo#112393]) -> [PASS][76]
>    [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled.html
>    [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb1/igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled.html
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-iclb:         [INCOMPLETE][77] ([fdo#107713] / [fdo#109507]) -> [PASS][78]
>    [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb3/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-iclb8/igt@kms_flip@flip-vs-suspend-interruptible.html
> 
>   * igt@kms_flip@plain-flip-ts-check-interruptible:
>     - shard-skl:          [FAIL][79] ([fdo#100368]) -> [PASS][80] +1 similar issue
>    [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible.html
>    [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl8/igt@kms_flip@plain-flip-ts-check-interruptible.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
>     - shard-tglb:         [INCOMPLETE][81] ([fdo#111884]) -> [PASS][82]
>    [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
>    [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc:
>     - shard-tglb:         [FAIL][83] ([fdo#103167]) -> [PASS][84] +2 similar issues
>    [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
>    [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu:
>     - shard-skl:          [INCOMPLETE][85] ([fdo#106978]) -> [PASS][86]
>    [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>    [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
> 
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
>     - shard-apl:          [DMESG-WARN][87] ([fdo#108566]) -> [PASS][88] +2 similar issues
>    [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>    [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
> 
>   * igt@kms_setmode@basic:
>     - shard-apl:          [FAIL][89] ([fdo#99912]) -> [PASS][90]
>    [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl8/igt@kms_setmode@basic.html
>    [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-apl2/igt@kms_setmode@basic.html
> 
>   * igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
>     - shard-tglb:         [INCOMPLETE][91] ([fdo#111832] / [fdo#111850]) -> [PASS][92] +1 similar issue
>    [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb4/igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend.html
>    [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-tglb5/igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend.html
> 
>   
> #### Warnings ####
> 
>   * igt@i915_pm_dc@dc6-dpms:
>     - shard-skl:          [FAIL][93] ([fdo#111830 ]) -> [INCOMPLETE][94] ([fdo#108972])
>    [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl1/igt@i915_pm_dc@dc6-dpms.html
>    [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15476/shard-skl8/igt@i915_pm_dc@dc6-dpms.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo# 111852 ]: https://bugs.freedesktop.org/show_bug.cgi?id= 111852 
>   [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#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
>   [fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>   [fdo#108972]: https://bugs.freedesktop.org/show_bug.cgi?id=108972
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>   [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
>   [fdo#111672]: https://bugs.freedesktop.org/show_bug.cgi?id=111672
>   [fdo#111677]: https://bugs.freedesktop.org/show_bug.cgi?id=111677
>   [fdo#111747]: https://bugs.freedesktop.org/show_bug.cgi?id=111747
>   [fdo#111830 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111830 
>   [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
>   [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850
>   [fdo#111880]: https://bugs.freedesktop.org/show_bug.cgi?id=111880
>   [fdo#111884]: https://bugs.freedesktop.org/show_bug.cgi?id=111884
>   [fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
>   [fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
>   [fdo#112347]: https://bugs.freedesktop.org/show_bug.cgi?id=112347
>   [fdo#112392]: https://bugs.freedesktop.org/show_bug.cgi?id=112392
>   [fdo#112393]: https://bugs.freedesktop.org/show_bug.cgi?id=112393
>   [fdo#112404]: https://bugs.freedesktop.org/show_bug.cgi?id=112404
>   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
>   [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
> 
> 
> Participating hosts (11 -> 11)
> ------------------------------
> 
>   No changes in participating hosts
> 
> 
> Build changes
> -------------
> 
>   * CI: CI-20190529 -> None
>   * Linux: CI_DRM_7434 -> Patchwork_15476
> 
>   CI-20190529: 20190529
>   CI_DRM_7434: 1bbc4d30ca9fd950cbcb73f324e00d0bc357758e @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_5312: 851c75531043cd906e028632b64b02b9312e9945 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_15476: 9387c33f58eddd457c1441c064a3f4fc25caa17a @ 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_15476/index.html
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 be9e8e4497bf..777adb875ba2 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5498,7 +5498,7 @@  static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
 }
 
-static bool icl_digital_port_connected(struct intel_encoder *encoder)
+static bool icp_digital_port_connected(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
@@ -5536,9 +5536,9 @@  static bool __intel_digital_port_connected(struct intel_encoder *encoder)
 			return g4x_digital_port_connected(encoder);
 	}
 
-	if (INTEL_GEN(dev_priv) >= 11)
-		return icl_digital_port_connected(encoder);
-	else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv))
+	if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
+		return icp_digital_port_connected(encoder);
+	else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
 		return spt_digital_port_connected(encoder);
 	else if (IS_GEN9_LP(dev_priv))
 		return bxt_digital_port_connected(encoder);