| Message ID | 20210524214805.259692-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/i915/display/adl_p: Drop earlier return in tc_has_modular_fia() | expand |
On 5/24/21 2:48 PM, José Roberto de Souza wrote: > MODULAR_FIA_MASK is set in adl_p so we can drop this ealier return > and read registers. > Also to avoid warnings from icl_tc_port_assert_ref_held() when > calling tc_cold_block() in this functions it is necessary to held the > lock. > > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_tc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c > index 5f03215a03e4..db85e0e2031e 100644 > --- a/drivers/gpu/drm/i915/display/intel_tc.c > +++ b/drivers/gpu/drm/i915/display/intel_tc.c > @@ -734,13 +734,11 @@ tc_has_modular_fia(struct drm_i915_private *i915, struct intel_digital_port *dig > if (!INTEL_INFO(i915)->display.has_modular_fia) > return false; > > - /* TODO: check if in real HW MODULAR_FIA_MASK is set, if so remove this block */ > - if (IS_ALDERLAKE_P(i915)) > - return true; > - > + mutex_lock(&dig_port->tc_lock); > wakeref = tc_cold_block(dig_port); > val = intel_uncore_read(&i915->uncore, PORT_TX_DFLEXDPSP(FIA1)); > tc_cold_unblock(dig_port, wakeref); > + mutex_unlock(&dig_port->tc_lock); > > drm_WARN_ON(&i915->drm, val == 0xffffffff); > Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> -Clint
On Tue, 2021-05-25 at 06:30 +0000, Patchwork wrote:
Patch Details
Series: series starting with [1/5] drm/i915/display/adl_p: Drop earlier return in tc_has_modular_fia()
URL: https://patchwork.freedesktop.org/series/90495/
State: success
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/index.html
CI Bug Log - changes from CI_DRM_10128_full -> Patchwork_20184_full
Summary
SUCCESS
No regressions found.
Pushed, thanks for the reviews Clint.
Known issues
Here are the changes found in Patchwork_20184_full that come from known issues:
IGT changes
Issues hit
* igt@gem_ctx_isolation@preservation-s3@bcs0:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl2/igt@gem_ctx_isolation@preservation-s3@bcs0.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@bcs0.html> ([i915#180]) +2 similar issues
* igt@gem_ctx_persistence@legacy-engines-mixed:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb7/igt@gem_ctx_persistence@legacy-engines-mixed.html> ([fdo#109271] / [i915#1099]) +5 similar issues
* igt@gem_exec_fair@basic-deadline:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl6/igt@gem_exec_fair@basic-deadline.html> ([i915#2846])
* igt@gem_exec_fair@basic-pace-solo@rcs0:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_exec_fair@basic-pace-solo@rcs0.html> ([i915#2842])
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-glk7/igt@gem_exec_fair@basic-pace-solo@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk9/igt@gem_exec_fair@basic-pace-solo@rcs0.html> ([i915#2842])
* igt@gem_exec_fair@basic-pace@rcs0:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl7/igt@gem_exec_fair@basic-pace@rcs0.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl1/igt@gem_exec_fair@basic-pace@rcs0.html> ([fdo#109271])
* igt@gem_exec_fair@basic-pace@vcs1:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl7/igt@gem_exec_fair@basic-pace@vcs1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842])
* igt@gem_exec_flush@basic-batch-kernel-default-cmd:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_exec_flush@basic-batch-kernel-default-cmd.html> ([fdo#109313])
* igt@gem_exec_params@no-bsd:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@gem_exec_params@no-bsd.html> ([fdo#109283])
* igt@gem_exec_reloc@basic-wide-active@vcs1:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_exec_reloc@basic-wide-active@vcs1.html> ([i915#2389])
* igt@gem_mmap_gtt@big-copy:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-glk3/igt@gem_mmap_gtt@big-copy.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk2/igt@gem_mmap_gtt@big-copy.html> ([i915#307])
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl4/igt@gem_mmap_gtt@big-copy.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl8/igt@gem_mmap_gtt@big-copy.html> ([i915#307])
* igt@gem_mmap_gtt@cpuset-basic-small-copy:
* shard-apl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@gem_mmap_gtt@cpuset-basic-small-copy.html> ([i915#3468])
* igt@gem_mmap_gtt@cpuset-basic-small-copy-odd:
* shard-iclb: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html> ([i915#2910] / [i915#3468])
* igt@gem_mmap_gtt@cpuset-basic-small-copy-xy:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-tglb7/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#3468])
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-apl7/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl2/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#3468])
* igt@gem_mmap_gtt@cpuset-big-copy-odd:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb2/igt@gem_mmap_gtt@cpuset-big-copy-odd.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb8/igt@gem_mmap_gtt@cpuset-big-copy-odd.html> ([i915#307])
* igt@gem_mmap_gtt@cpuset-medium-copy-xy:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-tglb2/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb1/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html> ([i915#3468] / [i915#750])
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb3/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb3/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html> ([i915#3468])
* igt@gem_mmap_gtt@fault-concurrent:
* shard-snb: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb6/igt@gem_mmap_gtt@fault-concurrent.html> ([i915#3468])
* igt@gem_mmap_gtt@fault-concurrent-x:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl6/igt@gem_mmap_gtt@fault-concurrent-x.html> ([i915#198] / [i915#3468])
* igt@gem_mmap_gtt@fault-concurrent-y:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl10/igt@gem_mmap_gtt@fault-concurrent-y.html> ([i915#3468]) +1 similar issue
* igt@gem_userptr_blits@coherency-sync:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_userptr_blits@coherency-sync.html> ([fdo#109290])
* igt@gem_userptr_blits@input-checking:
* shard-snb: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb6/igt@gem_userptr_blits@input-checking.html> ([i915#3002])
* igt@gen7_exec_parse@bitmasks:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gen7_exec_parse@bitmasks.html> ([fdo#109289])
* igt@gen7_exec_parse@chained-batch:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@gen7_exec_parse@chained-batch.html> ([fdo#109289])
* igt@gen9_exec_parse@unaligned-jump:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@gen9_exec_parse@unaligned-jump.html> ([fdo#112306])
* igt@i915_selftest@live@execlists:
* shard-glk: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk6/igt@i915_selftest@live@execlists.html> ([i915#3462])
* shard-kbl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl1/igt@i915_selftest@live@execlists.html> ([i915#2782] / [i915#3462] / [i915#794])
* igt@kms_atomic_transition@plane-all-modeset-transition:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_atomic_transition@plane-all-modeset-transition.html> ([i915#1769])
* igt@kms_big_fb@yf-tiled-64bpp-rotate-270:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_big_fb@yf-tiled-64bpp-rotate-270.html> ([fdo#111615])
* igt@kms_ccs@pipe-a-ccs-on-another-bo:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb6/igt@kms_ccs@pipe-a-ccs-on-another-bo.html> ([fdo#109271]) +526 similar issues
* igt@kms_chamelium@vga-hpd:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@kms_chamelium@vga-hpd.html> ([fdo#109271] / [fdo#111827]) +12 similar issues
* igt@kms_chamelium@vga-hpd-after-suspend:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_chamelium@vga-hpd-after-suspend.html> ([fdo#109284] / [fdo#111827]) +2 similar issues
* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb6/igt@kms_color_chamelium@pipe-a-ctm-blue-to-red.html> ([fdo#109271] / [fdo#111827]) +30 similar issues
* igt@kms_color_chamelium@pipe-b-ctm-max:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_color_chamelium@pipe-b-ctm-max.html> ([fdo#109271] / [fdo#111827]) +3 similar issues
* igt@kms_content_protection@atomic-dpms:
* shard-apl: NOTRUN -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl6/igt@kms_content_protection@atomic-dpms.html> ([i915#1319]) +1 similar issue
* igt@kms_content_protection@content_type_change:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_content_protection@content_type_change.html> ([fdo#111828])
* igt@kms_cursor_crc@pipe-c-cursor-512x512-rapid-movement:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_cursor_crc@pipe-c-cursor-512x512-rapid-movement.html> ([fdo#109278] / [fdo#109279])
* igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen.html> ([fdo#109279] / [i915#3359]) +2 similar issues
* igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl6/igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge.html> ([fdo#109271]) +29 similar issues
* igt@kms_cursor_legacy@cursorb-vs-flipa-atomic-transitions:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_cursor_legacy@cursorb-vs-flipa-atomic-transitions.html> ([fdo#109274] / [fdo#109278])
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346])
* igt@kms_cursor_legacy@pipe-d-single-move:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_cursor_legacy@pipe-d-single-move.html> ([fdo#109278]) +8 similar issues
* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium.html> ([fdo#109271] / [i915#2065])
* igt@kms_flip@2x-flip-vs-panning-vs-hang:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_flip@2x-flip-vs-panning-vs-hang.html> ([fdo#109274])
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html> ([i915#2587])
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite.html> ([fdo#109271]) +11 similar issues
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-wc:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-wc.html> ([fdo#111825]) +5 similar issues
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt.html> ([fdo#109280]) +6 similar issues
* igt@kms_hdr@static-toggle:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_hdr@static-toggle.html> ([i915#1187])
* igt@kms_invalid_dotclock:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_invalid_dotclock.html> ([fdo#109310])
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html> ([fdo#109271] / [i915#533]) +2 similar issues
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl6/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html> ([fdo#108145] / [i915#265]) +1 similar issue
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl6/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html> ([i915#265])
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html> ([fdo#108145] / [i915#265])
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html> ([fdo#108145] / [i915#265]) +1 similar issue
* igt@kms_plane_lowres@pipe-d-tiling-yf:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_plane_lowres@pipe-d-tiling-yf.html> ([fdo#112054])
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html> ([fdo#109271] / [i915#658]) +4 similar issues
* igt@kms_psr@psr2_cursor_mmap_cpu:
* shard-tglb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@kms_psr@psr2_cursor_mmap_cpu.html> ([i915#132] / [i915#3467])
* igt@kms_psr@psr2_sprite_plane_move:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html> ([fdo#109441]) +3 similar issues
* igt@kms_vblank@pipe-b-query-forked-busy-hang:
* shard-snb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-snb5/igt@kms_vblank@pipe-b-query-forked-busy-hang.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-snb2/igt@kms_vblank@pipe-b-query-forked-busy-hang.html> ([fdo#109271]) +7 similar issues
* igt@kms_vblank@pipe-d-wait-idle:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_vblank@pipe-d-wait-idle.html> ([fdo#109271] / [i915#533])
* igt@kms_writeback@writeback-fb-id:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl7/igt@kms_writeback@writeback-fb-id.html> ([fdo#109271] / [i915#2437]) +1 similar issue
* igt@nouveau_crc@pipe-c-source-outp-complete:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@nouveau_crc@pipe-c-source-outp-complete.html> ([i915#2530])
* igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html> ([fdo#109271]) +152 similar issues
* igt@prime_nv_pcopy@test2:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@prime_nv_pcopy@test2.html> ([fdo#109291])
* igt@sysfs_clients@fair-1:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@sysfs_clients@fair-1.html> ([i915#2994])
* igt@sysfs_clients@recycle:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl6/igt@sysfs_clients@recycle.html> ([fdo#109271] / [i915#2994]) +1 similar issue
* igt@sysfs_clients@split-25:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl2/igt@sysfs_clients@split-25.html> ([fdo#109271] / [i915#2994])
Possible fixes
* igt@gem_eio@wait-1us:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-glk7/igt@gem_eio@wait-1us.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk9/igt@gem_eio@wait-1us.html>
* igt@gem_exec_fair@basic-none-rrul@rcs0:
* shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl4/igt@gem_exec_fair@basic-none-rrul@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl3/igt@gem_exec_fair@basic-none-rrul@rcs0.html>
* igt@gem_exec_fair@basic-pace-share@rcs0:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-tglb1/igt@gem_exec_fair@basic-pace-share@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html>
* igt@gem_mmap_gtt@basic-small-copy-xy:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl6/igt@gem_mmap_gtt@basic-small-copy-xy.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl10/igt@gem_mmap_gtt@basic-small-copy-xy.html>
* igt@gem_mmap_gtt@cpuset-basic-small-copy:
* shard-tglb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-tglb5/igt@gem_mmap_gtt@cpuset-basic-small-copy.html> ([i915#3468]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-tglb3/igt@gem_mmap_gtt@cpuset-basic-small-copy.html>
* igt@gem_mmap_gtt@cpuset-basic-small-copy-xy:
* shard-kbl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl7/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#3468]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl1/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html>
* shard-glk: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-glk6/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#2055] / [i915#3468]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-glk6/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html>
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
* shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb3/igt@gem_mmap_gtt@cpuset-big-copy-xy.html> ([i915#307]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb3/igt@gem_mmap_gtt@cpuset-big-copy-xy.html>
* igt@gem_mmap_gtt@medium-copy-xy:
* shard-iclb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb6/igt@gem_mmap_gtt@medium-copy-xy.html> ([i915#2502] / [i915#3468]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@gem_mmap_gtt@medium-copy-xy.html>
* igt@i915_pm_rpm@system-suspend:
* shard-skl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl1/igt@i915_pm_rpm@system-suspend.html> ([i915#151]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@i915_pm_rpm@system-suspend.html>
* igt@kms_async_flips@alternate-sync-async-flip:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl1/igt@kms_async_flips@alternate-sync-async-flip.html> ([i915#2521]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl6/igt@kms_async_flips@alternate-sync-async-flip.html>
* igt@kms_color@pipe-a-ctm-0-5:
* shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl1/igt@kms_color@pipe-a-ctm-0-5.html> ([i915#1982]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_color@pipe-a-ctm-0-5.html>
* igt@kms_cursor_crc@pipe-a-cursor-256x256-onscreen:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl7/igt@kms_cursor_crc@pipe-a-cursor-256x256-onscreen.html> ([i915#3444]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl8/igt@kms_cursor_crc@pipe-a-cursor-256x256-onscreen.html>
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
* shard-skl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-suspend.html> ([i915#2405] / [i915#300]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html>
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html>
* igt@kms_flip@plain-flip-ts-check@a-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl8/igt@kms_flip@plain-flip-ts-check@a-edp1.html> ([i915#2122]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl3/igt@kms_flip@plain-flip-ts-check@a-edp1.html>
* igt@kms_hdr@bpc-switch-dpms:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html> ([i915#1188]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl6/igt@kms_hdr@bpc-switch-dpms.html> +1 similar issue
* igt@kms_hdr@bpc-switch-suspend:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl1/igt@kms_hdr@bpc-switch-suspend.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl2/igt@kms_hdr@bpc-switch-suspend.html> +2 similar issues
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html> ([fdo#108145] / [i915#265]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl8/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html>
* igt@kms_psr@psr2_suspend:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb6/igt@kms_psr@psr2_suspend.html> ([fdo#109441]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_psr@psr2_suspend.html>
Warnings
* igt@gem_mmap_gtt@cpuset-basic-small-copy-xy:
* shard-skl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-skl6/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#198]) -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-skl10/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html> ([i915#198] / [i915#3468])
* igt@i915_pm_dc@dc3co-vpb-simulation:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb6/igt@i915_pm_dc@dc3co-vpb-simulation.html> ([i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html> ([i915#588])
* igt@i915_pm_rc6_residency@rc6-fence:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb3/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#1804] / [i915#2684]) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb5/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#2684])
* igt@kms_flip@flip-vs-suspend@b-dp1:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-kbl2/igt@kms_flip@flip-vs-suspend@b-dp1.html> ([i915#180]) -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-kbl7/igt@kms_flip@flip-vs-suspend@b-dp1.html> ([i915#165] / [i915#180])
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb6/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html> ([i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html> ([i915#2920]) +1 similar issue
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html> ([i915#2920]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-iclb6/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html> ([i915#658]) +3 similar issues
* igt@runner@aborted:
* shard-apl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-apl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-apl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10128/shard-apl3/igt@runner@aborted.html>) ([fdo#109271] / [i915#1814] / [i915#2722] / [i915#3002] / [i915#3363]) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20184/shard-apl7/igt@runner@aborted.html>) ([i915#1814] / [i915#2722] / [i915#3002] / [i915#3363])
* shard-tglb: ([FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150], [FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154]) ([i915#1436] / [i915#2722] / [i915#2966] / [i915#3002]) -> ([FAIL][155], [FAIL][156], [FAIL][157], [FAIL][158], [FAIL][159
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index 5f03215a03e4..db85e0e2031e 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -734,13 +734,11 @@ tc_has_modular_fia(struct drm_i915_private *i915, struct intel_digital_port *dig if (!INTEL_INFO(i915)->display.has_modular_fia) return false; - /* TODO: check if in real HW MODULAR_FIA_MASK is set, if so remove this block */ - if (IS_ALDERLAKE_P(i915)) - return true; - + mutex_lock(&dig_port->tc_lock); wakeref = tc_cold_block(dig_port); val = intel_uncore_read(&i915->uncore, PORT_TX_DFLEXDPSP(FIA1)); tc_cold_unblock(dig_port, wakeref); + mutex_unlock(&dig_port->tc_lock); drm_WARN_ON(&i915->drm, val == 0xffffffff);
MODULAR_FIA_MASK is set in adl_p so we can drop this ealier return and read registers. Also to avoid warnings from icl_tc_port_assert_ref_held() when calling tc_cold_block() in this functions it is necessary to held the lock. Cc: Imre Deak <imre.deak@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_tc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)