diff mbox series

[1/4] drm/i915/migrate: don't check the scratch page

Message ID 20211206112539.3149779-1-matthew.auld@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915/migrate: don't check the scratch page | expand

Commit Message

Matthew Auld Dec. 6, 2021, 11:25 a.m. UTC 
The scratch page might not be allocated in LMEM(like on DG2), so instead
of using that as the deciding factor for where the paging structures
live, let's just query the pt before mapping it.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_migrate.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Matthew Auld Dec. 7, 2021, 2:15 p.m. UTC | #1 
On Mon, 6 Dec 2021 at 16:46, Patchwork <patchwork@emeril.freedesktop.org>
wrote:

> *Patch Details*
> *Series:* series starting with [1/4] drm/i915/migrate: don't check the
> scratch page
> *URL:* https://patchwork.freedesktop.org/series/97610/
> *State:* failure
> *Details:*
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/index.html CI
> Bug Log - changes from CI_DRM_10965_full -> Patchwork_21762_full Summary
>
> *FAILURE*
>
> Serious unknown changes coming with Patchwork_21762_full absolutely need
> to be
> verified manually.
>
> If you think the reported changes have nothing to do with the changes
> introduced in Patchwork_21762_full, please notify your bug team to allow
> them
> to document this new failure mode, which will reduce false positives in CI.
> Participating hosts (10 -> 10)
>
> No changes in participating hosts
> Possible new issues
>
> Here are the unknown changes that may have been introduced in
> Patchwork_21762_full:
> IGT changes Possible regressions
>
>    - igt@i915_selftest@live@vma:
>       - shard-skl: NOTRUN -> INCOMPLETE
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@i915_selftest@live@vma.html>
>
>
Looks to be false positive. These changes should only potentially impact
migration related stuff.


>
>    -
>
> Known issues
>
> Here are the changes found in Patchwork_21762_full that come from known
> issues:
> IGT changes Issues hit
>
>    -
>
>    igt@debugfs_test@read_all_entries:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl7/igt@debugfs_test@read_all_entries.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@debugfs_test@read_all_entries.html>
>       ([i915#203] / [i915#262] / [i915#62] / [i915#92])
>    -
>
>    igt@gem_eio@in-flight-contexts-10ms:
>    - shard-tglb: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-tglb3/igt@gem_eio@in-flight-contexts-10ms.html>
>       -> TIMEOUT
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb8/igt@gem_eio@in-flight-contexts-10ms.html>
>       ([i915#3063])
>    -
>
>    igt@gem_exec_capture@pi@bcs0:
>    - shard-skl: NOTRUN -> INCOMPLETE
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl10/igt@gem_exec_capture@pi@bcs0.html>
>       ([i915#4547])
>    -
>
>    igt@gem_exec_fair@basic-pace-share@rcs0:
>    - shard-glk: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk2/igt@gem_exec_fair@basic-pace-share@rcs0.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html>
>       ([i915#2842])
>    -
>
>    igt@gem_exec_fair@basic-pace@bcs0:
>    - shard-iclb: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-iclb7/igt@gem_exec_fair@basic-pace@bcs0.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb2/igt@gem_exec_fair@basic-pace@bcs0.html>
>       ([i915#2842])
>    -
>
>    igt@gem_exec_fair@basic-pace@vcs0:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl2/igt@gem_exec_fair@basic-pace@vcs0.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl7/igt@gem_exec_fair@basic-pace@vcs0.html>
>       ([i915#2842]) +1 similar issue
>    -
>
>    igt@gem_exec_fair@basic-pace@vcs1:
>    - shard-iclb: NOTRUN -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb2/igt@gem_exec_fair@basic-pace@vcs1.html>
>       ([i915#2842]) +1 similar issue
>    -
>
>    igt@gem_exec_fair@basic-pace@vecs0:
>    - shard-tglb: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-tglb1/igt@gem_exec_fair@basic-pace@vecs0.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb2/igt@gem_exec_fair@basic-pace@vecs0.html>
>       ([i915#2842])
>    -
>
>    igt@gem_lmem_swapping@heavy-verify-random:
>    - shard-kbl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@gem_lmem_swapping@heavy-verify-random.html>
>       ([fdo#109271] / [i915#4613])
>    -
>
>    igt@gem_lmem_swapping@parallel-random-verify:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@gem_lmem_swapping@parallel-random-verify.html>
>       ([fdo#109271] / [i915#4613])
>    -
>
>    igt@gem_lmem_swapping@smem-oom:
>    - shard-skl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@gem_lmem_swapping@smem-oom.html>
>       ([fdo#109271] / [i915#4613])
>    -
>
>    igt@gem_mmap_gtt@coherency:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@gem_mmap_gtt@coherency.html>
>       ([fdo#111656])
>    -
>
>    igt@gen7_exec_parse@cmd-crossing-page:
>    -
>
>       shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@gen7_exec_parse@cmd-crossing-page.html>
>       ([fdo#109289])
>       -
>
>       shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@gen7_exec_parse@cmd-crossing-page.html>
>       ([fdo#109289])
>       -
>
>    igt@i915_module_load@reload-no-display:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl7/igt@i915_module_load@reload-no-display.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@i915_module_load@reload-no-display.html>
>       ([i915#203])
>    -
>
>    igt@i915_pm_sseu@full-enable:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@i915_pm_sseu@full-enable.html>
>       ([i915#4387])
>    -
>
>    igt@i915_selftest@live@gt_pm:
>    - shard-skl: NOTRUN -> DMESG-FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@i915_selftest@live@gt_pm.html>
>       ([i915#1886] / [i915#2291])
>    -
>
>    igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl2/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip.html>
>       ([fdo#109271] / [i915#3777]) +1 similar issue
>    -
>
>    igt@kms_big_fb@yf-tiled-32bpp-rotate-180:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_big_fb@yf-tiled-32bpp-rotate-180.html>
>       ([fdo#111615])
>    -
>
>    igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs:
>    -
>
>       shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html>
>       ([fdo#109278] / [i915#3886])
>       -
>
>       shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html>
>       ([i915#3689] / [i915#3886])
>       -
>
>    igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc:
>    - shard-kbl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html>
>       ([fdo#109271] / [i915#3886])
>    -
>
>    igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html>
>       ([fdo#109271] / [i915#3886]) +3 similar issues
>    -
>
>    igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_ccs:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_ccs.html>
>       ([i915#3689]) +1 similar issue
>    -
>
>    igt@kms_ccs@pipe-c-bad-pixel-format-yf_tiled_ccs:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_ccs@pipe-c-bad-pixel-format-yf_tiled_ccs.html>
>       ([fdo#111615] / [i915#3689])
>    -
>
>    igt@kms_cdclk@mode-transition:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_cdclk@mode-transition.html>
>       ([fdo#109271]) +64 similar issues
>    -
>
>    igt@kms_chamelium@dp-hpd-storm-disable:
>    - shard-skl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_chamelium@dp-hpd-storm-disable.html>
>       ([fdo#109271] / [fdo#111827]) +2 similar issues
>    -
>
>    igt@kms_chamelium@hdmi-hpd-storm-disable:
>    - shard-kbl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_chamelium@hdmi-hpd-storm-disable.html>
>       ([fdo#109271] / [fdo#111827])
>    -
>
>    igt@kms_color_chamelium@pipe-b-gamma:
>    - shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@kms_color_chamelium@pipe-b-gamma.html>
>       ([fdo#109284] / [fdo#111827])
>    -
>
>    igt@kms_color_chamelium@pipe-c-ctm-max:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl7/igt@kms_color_chamelium@pipe-c-ctm-max.html>
>       ([fdo#109271] / [fdo#111827]) +4 similar issues
>    -
>
>    igt@kms_color_chamelium@pipe-d-ctm-red-to-blue:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_color_chamelium@pipe-d-ctm-red-to-blue.html>
>       ([fdo#109284] / [fdo#111827]) +3 similar issues
>    -
>
>    igt@kms_content_protection@legacy:
>    - shard-apl: NOTRUN -> TIMEOUT
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_content_protection@legacy.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_10965/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-suspend.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html>
>       ([i915#180]) +7 similar issues
>    -
>
>    igt@kms_cursor_crc@pipe-c-cursor-max-size-offscreen:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_cursor_crc@pipe-c-cursor-max-size-offscreen.html>
>       ([i915#3359])
>    -
>
>    igt@kms_cursor_crc@pipe-d-cursor-512x170-onscreen:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-512x170-onscreen.html>
>       ([fdo#109279] / [i915#3359]) +1 similar issue
>    -
>
>    igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge:
>    - shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge.html>
>       ([fdo#109278])
>    -
>
>    igt@kms_cursor_legacy@pipe-c-single-bo:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl7/igt@kms_cursor_legacy@pipe-c-single-bo.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_cursor_legacy@pipe-c-single-bo.html>
>       ([i915#203] / [i915#62] / [i915#92]) +5 similar issues
>    -
>
>    igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
>    - shard-glk: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk1/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk6/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html>
>       ([i915#2122])
>    -
>
>    igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
>    - shard-apl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html>
>       ([i915#180])
>    -
>
>    igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1:
>    - shard-skl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl1/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html>
>       ([i915#2122])
>    -
>
>    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc:
>    - shard-glk: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-wc.html>
>       ([i915#1888] / [i915#2546])
>    -
>
>    igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu:
>    - shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu.html>
>       ([fdo#109280])
>    -
>
>    igt@kms_frontbuffer_tracking
>    @fbcpsr-2p-primscrn-cur-indfb-draw-mmap-cpu:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-mmap-cpu.html>
>       ([fdo#111825]) +10 similar issues
>    -
>
>    igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-render:
>    - shard-kbl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-render.html>
>       ([fdo#109271]) +9 similar issues
>    -
>
>    igt@kms_hdr@bpc-switch-dpms:
>    - shard-skl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl3/igt@kms_hdr@bpc-switch-dpms.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_hdr@bpc-switch-dpms.html>
>       ([i915#1188])
>    -
>
>    igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html>
>       ([fdo#109271] / [i915#533])
>    -
>
>    igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
>    - shard-apl: NOTRUN -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max.html>
>       ([fdo#108145] / [i915#265])
>    -
>
>    igt@kms_plane_alpha_blend@pipe-a-constant-alpha-mid:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-mid.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-mid.html>
>       ([i915#180] / [i915#203] / [i915#62] / [i915#92]) +10 similar issues
>    -
>
>    igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
>    - shard-skl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html>
>       ([fdo#108145] / [i915#265])
>    -
>
>    igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1:
>    - shard-kbl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl3/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html>
>       ([fdo#109271] / [i915#658])
>    -
>
>    igt@kms_psr2_su@frontbuffer-xrgb8888:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl6/igt@kms_psr2_su@frontbuffer-xrgb8888.html>
>       ([fdo#109271] / [i915#658])
>    -
>
>    igt@kms_psr@psr2_cursor_mmap_cpu:
>    - shard-iclb: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html>
>       -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb8/igt@kms_psr@psr2_cursor_mmap_cpu.html>
>       ([fdo#109441]) +2 similar issues
>    -
>
>    igt@kms_psr@psr2_cursor_render:
>    - shard-tglb: NOTRUN -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@kms_psr@psr2_cursor_render.html>
>       ([i915#132] / [i915#3467])
>    -
>
>    igt@kms_setmode@basic:
>    - shard-apl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-apl3/igt@kms_setmode@basic.html>
>       -> FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl1/igt@kms_setmode@basic.html>
>       ([i915#31])
>    -
>
>    igt@kms_vblank@pipe-a-ts-continuation-suspend:
>    - shard-kbl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl3/igt@kms_vblank@pipe-a-ts-continuation-suspend.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html>
>       ([i915#180] / [i915#295])
>    -
>
>    igt@kms_vblank@pipe-d-wait-idle:
>    - shard-skl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_vblank@pipe-d-wait-idle.html>
>       ([fdo#109271] / [i915#533])
>    -
>
>    igt@kms_vrr@flip-suspend:
>    - shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@kms_vrr@flip-suspend.html>
>       ([fdo#109502])
>    -
>
>    igt@nouveau_crc@ctx-flip-threshold-reset-after-capture:
>    - shard-skl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@nouveau_crc@ctx-flip-threshold-reset-after-capture.html>
>       ([fdo#109271]) +32 similar issues
>    -
>
>    igt@perf_pmu@module-unload:
>    - shard-skl: PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl8/igt@perf_pmu@module-unload.html>
>       -> DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl6/igt@perf_pmu@module-unload.html>
>       ([i915#1982] / [i915#262])
>    -
>
>    igt@prime_nv_pcopy@test3_5:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@prime_nv_pcopy@test3_5.html>
>       ([fdo#109291])
>    -
>
>    igt@prime_vgem@fence-read-hang:
>    - shard-tglb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-tglb1/igt@prime_vgem@fence-read-hang.html>
>       ([fdo#109295])
>    -
>
>    igt@sysfs_clients@fair-3:
>    - shard-skl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@sysfs_clients@fair-3.html>
>       ([fdo#109271] / [i915#2994])
>    -
>
>    igt@sysfs_clients@recycle:
>    - shard-apl: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl2/igt@sysfs_clients@recycle.html>
>       ([fdo#109271] / [i915#2994]) +1 similar issue
>    -
>
>    igt@sysfs_clients@split-25:
>    - shard-iclb: NOTRUN -> SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb6/igt@sysfs_clients@split-25.html>
>       ([i915#2994])
>
> Possible fixes
>
>    -
>
>    igt@feature_discovery@psr2:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-4/igt@feature_discovery@psr2.html>
>       ([i915#658]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@feature_discovery@psr2.html>
>    -
>
>    igt@gem_eio@unwedge-stress:
>    - {shard-rkl}: TIMEOUT
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-4/igt@gem_eio@unwedge-stress.html>
>       ([i915#3063]) -> (PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-2/igt@gem_eio@unwedge-stress.html>,
>       PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-4/igt@gem_eio@unwedge-stress.html>
>       )
>    -
>
>    igt@gem_exec_capture@pi@rcs0:
>    - shard-skl: INCOMPLETE
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl3/igt@gem_exec_capture@pi@rcs0.html>
>       ([i915#4547]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl10/igt@gem_exec_capture@pi@rcs0.html>
>    -
>
>    igt@gem_exec_fair@basic-deadline:
>    - shard-glk: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk8/igt@gem_exec_fair@basic-deadline.html>
>       ([i915#2846]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk4/igt@gem_exec_fair@basic-deadline.html>
>    -
>
>    igt@gem_exec_fair@basic-none-share@rcs0:
>    - shard-apl: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-apl7/igt@gem_exec_fair@basic-none-share@rcs0.html>
>       ([fdo#109271]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl7/igt@gem_exec_fair@basic-none-share@rcs0.html>
>    -
>
>    igt@gem_exec_fair@basic-none-solo@rcs0:
>    - {shard-rkl}: (FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-4/igt@gem_exec_fair@basic-none-solo@rcs0.html>,
>       FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-1/igt@gem_exec_fair@basic-none-solo@rcs0.html>)
>       ([i915#2842] / [i915#2849]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-1/igt@gem_exec_fair@basic-none-solo@rcs0.html>
>    -
>
>    igt@gem_exec_fair@basic-none@vecs0:
>    - shard-apl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-apl3/igt@gem_exec_fair@basic-none@vecs0.html>
>       ([i915#2842]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl2/igt@gem_exec_fair@basic-none@vecs0.html>
>    -
>
>    igt@gem_exec_fair@basic-pace@rcs0:
>    - shard-kbl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl2/igt@gem_exec_fair@basic-pace@rcs0.html>
>       ([i915#2842]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl7/igt@gem_exec_fair@basic-pace@rcs0.html>
>    -
>
>    igt@gem_exec_fair@basic-throttle@rcs0:
>    - shard-iclb: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-iclb7/igt@gem_exec_fair@basic-throttle@rcs0.html>
>       ([i915#2849]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html>
>    -
>
>    igt@gem_exec_whisper@basic-forked-all:
>    - shard-glk: DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk2/igt@gem_exec_whisper@basic-forked-all.html>
>       ([i915#118]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk7/igt@gem_exec_whisper@basic-forked-all.html>
>    -
>
>    igt@gem_workarounds@suspend-resume:
>    - shard-skl: INCOMPLETE
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl3/igt@gem_workarounds@suspend-resume.html>
>       ([i915#198]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl8/igt@gem_workarounds@suspend-resume.html>
>    -
>
>    igt@i915_pm_rpm@pm-tiling:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-2/igt@i915_pm_rpm@pm-tiling.html>
>       ([fdo#109308]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@i915_pm_rpm@pm-tiling.html>
>    -
>
>    igt@kms_big_fb@y-tiled-32bpp-rotate-0:
>    - shard-glk: DMESG-FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk5/igt@kms_big_fb@y-tiled-32bpp-rotate-0.html>
>       ([i915#118] / [i915#1888]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk3/igt@kms_big_fb@y-tiled-32bpp-rotate-0.html>
>    -
>
>    igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-2/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html>
>       ([i915#1845]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html>
>       +5 similar issues
>    -
>
>    igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
>    - shard-skl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html>
>       ([i915#2346]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html>
>    -
>
>    igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
>    - shard-iclb: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html>
>       ([i915#2346]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html>
>    -
>
>    igt@kms_cursor_legacy@pipe-c-torture-move:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-2/igt@kms_cursor_legacy@pipe-c-torture-move.html>
>       ([i915#4070]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-4/igt@kms_cursor_legacy@pipe-c-torture-move.html>
>    -
>
>    igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
>    - shard-kbl: DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-kbl1/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html>
>       ([i915#180]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-kbl6/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html>
>       +1 similar issue
>    -
>
>    igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
>    - shard-apl: DMESG-WARN
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html>
>       ([i915#180]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html>
>       +3 similar issues
>    -
>
>    igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1:
>    - shard-skl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl1/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html>
>       ([i915#2122]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html>
>    -
>
>    igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html>
>       ([i915#4098]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html>
>       +4 similar issues
>    -
>
>    igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt.html>
>       ([i915#1849]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt.html>
>       +2 similar issues
>    -
>
>    igt@kms_hdr@bpc-switch-suspend:
>    - shard-skl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl4/igt@kms_hdr@bpc-switch-suspend.html>
>       ([i915#1188]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl9/igt@kms_hdr@bpc-switch-suspend.html>
>    -
>
>    igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>    - shard-skl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html>
>       ([fdo#108145] / [i915#265]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html>
>    -
>
>    igt@kms_psr@cursor_render:
>    - {shard-rkl}: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-rkl-4/igt@kms_psr@cursor_render.html>
>       ([i915#1072]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-rkl-6/igt@kms_psr@cursor_render.html>
>    -
>
>    igt@kms_psr@psr2_cursor_plane_onoff:
>    - shard-iclb: SKIP
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-iclb6/igt@kms_psr@psr2_cursor_plane_onoff.html>
>       ([fdo#109441]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html>
>       +3 similar issues
>    -
>
>    igt@kms_setmode@basic:
>    - shard-glk: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-glk3/igt@kms_setmode@basic.html>
>       ([i915#31]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-glk1/igt@kms_setmode@basic.html>
>    -
>
>    igt@perf@short-reads:
>    - shard-skl: FAIL
>       <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10965/shard-skl10/igt@perf@short-reads.html>
>       ([i915#51]) -> PASS
>       <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21762/shard-skl7/igt@perf@short-reads.html>
>
> Warnings
>
>    - igt@gen9_exec_parse@bb-oversize:
>       - shard-skl: SKIP <https://intel-gf> ([fdo#109271]) -> [SKIP][145]
>       ([fdo#109271] / [i915#1888])
>
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
index afb1cce9a352..0f94dedc1599 100644
--- a/drivers/gpu/drm/i915/gt/intel_migrate.c
+++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
@@ -13,7 +13,6 @@ 
 
 struct insert_pte_data {
 	u64 offset;
-	bool is_lmem;
 };
 
 #define CHUNK_SZ SZ_8M /* ~1ms at 8GiB/s preemption delay */
@@ -40,7 +39,7 @@  static void insert_pte(struct i915_address_space *vm,
 	struct insert_pte_data *d = data;
 
 	vm->insert_page(vm, px_dma(pt), d->offset, I915_CACHE_NONE,
-			d->is_lmem ? PTE_LM : 0);
+			i915_gem_object_is_lmem(pt->base) ? PTE_LM : 0);
 	d->offset += PAGE_SIZE;
 }
 
@@ -134,7 +133,6 @@  static struct i915_address_space *migrate_vm(struct intel_gt *gt)
 			goto err_vm;
 
 		/* Now allow the GPU to rewrite the PTE via its own ppGTT */
-		d.is_lmem = i915_gem_object_is_lmem(vm->vm.scratch[0]);
 		vm->vm.foreach(&vm->vm, base, base + sz, insert_pte, &d);
 	}