Message ID | 20220907172641.12555-1-nirmoy.das@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Set correct domains values at _i915_vma_move_to_active | expand |
On 07.09.2022 19:26, Nirmoy Das wrote: > Fix regression introduced by commit: > "drm/i915: Individualize fences before adding to dma_resv obj" > which sets obj->read_domains to 0 for both read and write paths. > Also set obj->write_domain to 0 on read path which was removed by > the commit. > > References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 > Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding to dma_resv obj") > Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> > Cc: <stable@vger.kernel.org> # v5.16+ > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Regards Andrzej > --- > drivers/gpu/drm/i915/i915_vma.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index 260371716490..373582cfd8f3 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma *vma, > enum dma_resv_usage usage; > int idx; > > - obj->read_domains = 0; > if (flags & EXEC_OBJECT_WRITE) { > usage = DMA_RESV_USAGE_WRITE; > obj->write_domain = I915_GEM_DOMAIN_RENDER; > + obj->read_domains = 0; > } else { > usage = DMA_RESV_USAGE_READ; > + obj->write_domain = 0; > } > > dma_fence_array_for_each(curr, idx, fence)
On 07/09/2022 18:26, Nirmoy Das wrote: > Fix regression introduced by commit: > "drm/i915: Individualize fences before adding to dma_resv obj" > which sets obj->read_domains to 0 for both read and write paths. > Also set obj->write_domain to 0 on read path which was removed by > the commit. > > References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 > Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding to dma_resv obj") > Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> > Cc: <stable@vger.kernel.org> # v5.16+ > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> Should I go ahead and push this? > --- > drivers/gpu/drm/i915/i915_vma.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index 260371716490..373582cfd8f3 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma *vma, > enum dma_resv_usage usage; > int idx; > > - obj->read_domains = 0; > if (flags & EXEC_OBJECT_WRITE) { > usage = DMA_RESV_USAGE_WRITE; > obj->write_domain = I915_GEM_DOMAIN_RENDER; > + obj->read_domains = 0; > } else { > usage = DMA_RESV_USAGE_READ; > + obj->write_domain = 0; > } > > dma_fence_array_for_each(curr, idx, fence)
On 9/8/2022 11:40 AM, Matthew Auld wrote: > On 07/09/2022 18:26, Nirmoy Das wrote: >> Fix regression introduced by commit: >> "drm/i915: Individualize fences before adding to dma_resv obj" >> which sets obj->read_domains to 0 for both read and write paths. >> Also set obj->write_domain to 0 on read path which was removed by >> the commit. >> >> References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 >> Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding to >> dma_resv obj") >> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> >> Cc: <stable@vger.kernel.org> # v5.16+ >> Cc: Matthew Auld <matthew.auld@intel.com> >> Cc: Andrzej Hajda <andrzej.hajda@intel.com> > > Should I go ahead and push this? Yes, please go ahead. Lots people are effected because of this regression. Nirmoy > >> --- >> drivers/gpu/drm/i915/i915_vma.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_vma.c >> b/drivers/gpu/drm/i915/i915_vma.c >> index 260371716490..373582cfd8f3 100644 >> --- a/drivers/gpu/drm/i915/i915_vma.c >> +++ b/drivers/gpu/drm/i915/i915_vma.c >> @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma >> *vma, >> enum dma_resv_usage usage; >> int idx; >> - obj->read_domains = 0; >> if (flags & EXEC_OBJECT_WRITE) { >> usage = DMA_RESV_USAGE_WRITE; >> obj->write_domain = I915_GEM_DOMAIN_RENDER; >> + obj->read_domains = 0; >> } else { >> usage = DMA_RESV_USAGE_READ; >> + obj->write_domain = 0; >> } >> dma_fence_array_for_each(curr, idx, fence)
On 9/8/2022 3:01 AM, Patchwork wrote: > Project List - Patchwork *Patch Details* > *Series:* drm/i915: Set correct domains values at > _i915_vma_move_to_active > *URL:* https://patchwork.freedesktop.org/series/108258/ > *State:* failure > *Details:* > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/index.html > > > CI Bug Log - changes from CI_DRM_12089_full -> Patchwork_108258v1_full > > > Summary > > *FAILURE* > > Serious unknown changes coming with Patchwork_108258v1_full absolutely > need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_108258v1_full, please notify your bug team to > allow them > to document this new failure mode, which will reduce false positives > in CI. > > > Participating hosts (12 -> 12) > > No changes in participating hosts > > > Possible new issues > > Here are the unknown changes that may have been introduced in > Patchwork_108258v1_full: > > > IGT changes > > > Possible regressions > > * > > igt@i915_module_load@reload-with-fault-injection: > > o shard-tglb: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglb6/igt@i915_module_load@reload-with-fault-injection.html> > -> INCOMPLETE > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglb5/igt@i915_module_load@reload-with-fault-injection.html> > There is a NPD which happened before this machine https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12091/shard-tglb1/igt@i915_module_load@reload-with-fault-injection.html Unrelated to this series but need more investigation. <1> [483.195059] BUG: kernel NULL pointer dereference, address: 0000000000000000 <1> [483.195067] #PF: supervisor read access in kernel mode <1> [483.195070] #PF: error_code(0x0000) - not-present page <6> [483.195074] PGD 0 P4D 0 <4> [483.195077] Oops: 0000 [#1] PREEMPT SMP NOPTI <4> [483.195081] CPU: 1 PID: 1555 Comm: i915_module_loa Tainted: G U 6.0.0-rc4-Patchwork_108258v1-g15f061f3fed9+ #1 <4> [483.195086] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake U DDR4 SODIMM RVP, BIOS TGLSFWI1.R00.3197.A00.2005110542 05/11/2020 <4> [483.195091] RIP: 0010:intel_uc_fw_fetch+0x2e3/0x440 [i915] > * > * > > igt@i915_pm_rps@engine-order: > > o shard-apl: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/igt@i915_pm_rps@engine-order.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/igt@i915_pm_rps@engine-order.html> > Unrelated failure at https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/master/tests/i915/i915_pm_rps.c#L861 Nirmoy > * > > > Known issues > > Here are the changes found in Patchwork_108258v1_full that come from > known issues: > > > CI changes > > > Issues hit > > * boot: > o shard-apl: (PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/boot.html>) > -> (FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl3/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl4/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl6/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl8/boot.html>, > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl8/boot.html>) > (i915#4386 <https://gitlab.freedesktop.org/drm/intel/issues/4386>) > > > IGT changes > > > Issues hit > > * > > igt@gem_eio@in-flight-contexts-1us: > > o shard-apl: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/igt@gem_eio@in-flight-contexts-1us.html> > -> TIMEOUT > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/igt@gem_eio@in-flight-contexts-1us.html> > (i915#3063 <https://gitlab.freedesktop.org/drm/intel/issues/3063>) > * > > igt@gem_eio@kms: > > o shard-tglb: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglb7/igt@gem_eio@kms.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglb2/igt@gem_eio@kms.html> > (i915#5784 <https://gitlab.freedesktop.org/drm/intel/issues/5784>) > * > > igt@gem_exec_fair@basic-pace-share@rcs0: > > o > > shard-glk: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk3/igt@gem_exec_fair@basic-pace-share@rcs0.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk6/igt@gem_exec_fair@basic-pace-share@rcs0.html> > (i915#2842 > <https://gitlab.freedesktop.org/drm/intel/issues/2842>) +2 > similar issues > > o > > shard-apl: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl2/igt@gem_exec_fair@basic-pace-share@rcs0.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/igt@gem_exec_fair@basic-pace-share@rcs0.html> > (i915#2842 <https://gitlab.freedesktop.org/drm/intel/issues/2842>) > > * > > igt@gem_exec_fair@basic-pace@vcs1: > > o shard-iclb: NOTRUN -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb2/igt@gem_exec_fair@basic-pace@vcs1.html> > (i915#2842 <https://gitlab.freedesktop.org/drm/intel/issues/2842>) > * > > igt@gem_huc_copy@huc-copy: > > o shard-tglb: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglb2/igt@gem_huc_copy@huc-copy.html> > -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglb6/igt@gem_huc_copy@huc-copy.html> > (i915#2190 <https://gitlab.freedesktop.org/drm/intel/issues/2190>) > * > > igt@gen9_exec_parse@allowed-all: > > o shard-glk: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk5/igt@gen9_exec_parse@allowed-all.html> > -> DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk8/igt@gen9_exec_parse@allowed-all.html> > (i915#5566 > <https://gitlab.freedesktop.org/drm/intel/issues/5566> / > i915#716 <https://gitlab.freedesktop.org/drm/intel/issues/716>) > * > > igt@gen9_exec_parse@allowed-single: > > o shard-apl: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/igt@gen9_exec_parse@allowed-single.html> > -> DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/igt@gen9_exec_parse@allowed-single.html> > (i915#5566 > <https://gitlab.freedesktop.org/drm/intel/issues/5566> / > i915#716 <https://gitlab.freedesktop.org/drm/intel/issues/716>) > * > > igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc: > > o shard-apl: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html> > (fdo#109271 > <https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#3886 > <https://gitlab.freedesktop.org/drm/intel/issues/3886>) +2 > similar issues > * > > igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs: > > o shard-apl: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs.html> > (fdo#109271 > <https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +46 > similar issues > * > > igt@kms_chamelium@hdmi-hpd-fast: > > o shard-apl: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/igt@kms_chamelium@hdmi-hpd-fast.html> > (fdo#109271 > <https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > fdo#111827 <https://bugs.freedesktop.org/show_bug.cgi?id=111827>) > * > > igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size: > > o shard-glk: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk1/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html> > (i915#2346 > <https://gitlab.freedesktop.org/drm/intel/issues/2346>) +1 > similar issue > * > > igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2: > > o shard-glk: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html> > -> FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html> > (i915#79 <https://gitlab.freedesktop.org/drm/intel/issues/79>) > * > > igt@kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling@pipe-a-default-mode: > > o shard-iclb: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling@pipe-a-default-mode.html> > (i915#3555 > <https://gitlab.freedesktop.org/drm/intel/issues/3555>) +1 > similar issue > * > > igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode: > > o shard-iclb: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb6/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html> > (i915#2672 > <https://gitlab.freedesktop.org/drm/intel/issues/2672>) +7 > similar issues > * > > igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode: > > o shard-iclb: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb6/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html> > (i915#2672 > <https://gitlab.freedesktop.org/drm/intel/issues/2672> / > i915#3555 <https://gitlab.freedesktop.org/drm/intel/issues/3555>) > * > > igt@kms_psr2_sf@plane-move-sf-dmg-area: > > o shard-apl: NOTRUN -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl8/igt@kms_psr2_sf@plane-move-sf-dmg-area.html> > (fdo#109271 > <https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#658 <https://gitlab.freedesktop.org/drm/intel/issues/658>) > * > > igt@kms_psr_stress_test@flip-primary-invalidate-overlay: > > o shard-tglb: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglb1/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html> > -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglb3/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html> > (i915#5519 <https://gitlab.freedesktop.org/drm/intel/issues/5519>) > * > > igt@kms_psr_stress_test@invalidate-primary-flip-overlay: > > o shard-iclb: PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb3/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html> > -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb6/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html> > (i915#5519 <https://gitlab.freedesktop.org/drm/intel/issues/5519>) > > > Possible fixes > > * > > igt@gem_ctx_exec@basic-nohangcheck: > > o shard-tglb: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglb3/igt@gem_ctx_exec@basic-nohangcheck.html> > (i915#6268 > <https://gitlab.freedesktop.org/drm/intel/issues/6268>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglb7/igt@gem_ctx_exec@basic-nohangcheck.html> > * > > igt@gem_exec_balancer@parallel: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb5/igt@gem_exec_balancer@parallel.html> > (i915#4525 > <https://gitlab.freedesktop.org/drm/intel/issues/4525>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb4/igt@gem_exec_balancer@parallel.html> > * > > igt@gem_exec_fair@basic-deadline: > > o {shard-rkl}: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-rkl-2/igt@gem_exec_fair@basic-deadline.html> > (i915#2846 > <https://gitlab.freedesktop.org/drm/intel/issues/2846>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-rkl-5/igt@gem_exec_fair@basic-deadline.html> > * > > igt@gem_exec_fair@basic-pace-share@rcs0: > > o {shard-tglu}: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglu-1/igt@gem_exec_fair@basic-pace-share@rcs0.html> > (i915#2842 > <https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglu-1/igt@gem_exec_fair@basic-pace-share@rcs0.html> > * > > igt@gem_exec_fair@basic-pace-solo@rcs0: > > o shard-apl: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl6/igt@gem_exec_fair@basic-pace-solo@rcs0.html> > (i915#2842 > <https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl2/igt@gem_exec_fair@basic-pace-solo@rcs0.html> > * > > igt@gem_exec_reloc@basic-gtt-read-noreloc: > > o {shard-rkl}: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-rkl-2/igt@gem_exec_reloc@basic-gtt-read-noreloc.html> > (i915#3281 > <https://gitlab.freedesktop.org/drm/intel/issues/3281>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-read-noreloc.html> > +1 similar issue > * > > igt@gem_exec_suspend@basic-s3@smem: > > o shard-apl: DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/igt@gem_exec_suspend@basic-s3@smem.html> > (i915#180 > <https://gitlab.freedesktop.org/drm/intel/issues/180>) -> PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl1/igt@gem_exec_suspend@basic-s3@smem.html> > +2 similar issues > * > > igt@gen9_exec_parse@bb-start-param: > > o {shard-rkl}: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-rkl-2/igt@gen9_exec_parse@bb-start-param.html> > (i915#2527 > <https://gitlab.freedesktop.org/drm/intel/issues/2527>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-rkl-5/igt@gen9_exec_parse@bb-start-param.html> > * > > igt@i915_pm_dc@dc9-dpms: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb3/igt@i915_pm_dc@dc9-dpms.html> > (i915#4281 > <https://gitlab.freedesktop.org/drm/intel/issues/4281>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb6/igt@i915_pm_dc@dc9-dpms.html> > * > > igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a: > > o {shard-tglu}: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-tglu-4/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html> > (i915#3825 > <https://gitlab.freedesktop.org/drm/intel/issues/3825>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-tglu-1/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html> > * > > igt@kms_flip@flip-vs-blocking-wf-vblank@b-hdmi-a2: > > o shard-glk: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk2/igt@kms_flip@flip-vs-blocking-wf-vblank@b-hdmi-a2.html> > (i915#2122 > <https://gitlab.freedesktop.org/drm/intel/issues/2122>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk2/igt@kms_flip@flip-vs-blocking-wf-vblank@b-hdmi-a2.html> > * > > igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb2/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html> > (i915#5235 > <https://gitlab.freedesktop.org/drm/intel/issues/5235>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb5/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html> > +2 similar issues > * > > igt@kms_psr@psr2_sprite_render: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb6/igt@kms_psr@psr2_sprite_render.html> > (fdo#109441 > <https://bugs.freedesktop.org/show_bug.cgi?id=109441>) -> PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb2/igt@kms_psr@psr2_sprite_render.html> > +2 similar issues > * > > igt@perf_pmu@busy-double-start@bcs0: > > o shard-glk: DMESG-WARN > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-glk2/igt@perf_pmu@busy-double-start@bcs0.html> > (i915#118 > <https://gitlab.freedesktop.org/drm/intel/issues/118>) -> PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-glk2/igt@perf_pmu@busy-double-start@bcs0.html> > * > > igt@prime_vgem@coherency-gtt: > > o {shard-rkl}: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-rkl-2/igt@prime_vgem@coherency-gtt.html> > (fdo#109295 > <https://bugs.freedesktop.org/show_bug.cgi?id=109295> / > fdo#111656 > <https://bugs.freedesktop.org/show_bug.cgi?id=111656> / > i915#3708 > <https://gitlab.freedesktop.org/drm/intel/issues/3708>) -> > PASS > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-rkl-5/igt@prime_vgem@coherency-gtt.html> > > > Warnings > > * > > igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb2/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf.html> > (i915#2920 > <https://gitlab.freedesktop.org/drm/intel/issues/2920>) -> > SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb5/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf.html> > (i915#658 <https://gitlab.freedesktop.org/drm/intel/issues/658>) > * > > igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb6/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html> > (fdo#111068 > <https://bugs.freedesktop.org/show_bug.cgi?id=111068> / > i915#658 > <https://gitlab.freedesktop.org/drm/intel/issues/658>) -> SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html> > (i915#2920 > <https://gitlab.freedesktop.org/drm/intel/issues/2920>) +1 > similar issue > * > > igt@kms_psr2_sf@primary-plane-update-sf-dmg-area: > > o shard-iclb: SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html> > (i915#2920 > <https://gitlab.freedesktop.org/drm/intel/issues/2920>) -> > SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb5/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html> > (fdo#111068 > <https://bugs.freedesktop.org/show_bug.cgi?id=111068> / > i915#658 <https://gitlab.freedesktop.org/drm/intel/issues/658>) > * > > igt@kms_psr2_su@page_flip-p010: > > o shard-iclb: FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-iclb2/igt@kms_psr2_su@page_flip-p010.html> > (i915#5939 > <https://gitlab.freedesktop.org/drm/intel/issues/5939>) -> > SKIP > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-iclb5/igt@kms_psr2_su@page_flip-p010.html> > (fdo#109642 > <https://bugs.freedesktop.org/show_bug.cgi?id=109642> / > fdo#111068 > <https://bugs.freedesktop.org/show_bug.cgi?id=111068> / > i915#658 <https://gitlab.freedesktop.org/drm/intel/issues/658>) > * > > igt@runner@aborted: > > o shard-apl: (FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl7/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl4/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl1/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12089/shard-apl3/igt@runner@aborted.html>) > (i915#180 > <https://gitlab.freedesktop.org/drm/intel/issues/180> / > i915#3002 > <https://gitlab.freedesktop.org/drm/intel/issues/3002> / > i915#4312 > <https://gitlab.freedesktop.org/drm/intel/issues/4312> / > i915#5257 > <https://gitlab.freedesktop.org/drm/intel/issues/5257> / > i915#6599 > <https://gitlab.freedesktop.org/drm/intel/issues/6599>) -> > (FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl6/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/igt@runner@aborted.html>, > FAIL > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108258v1/shard-apl7/igt@runner@aborted.html>) > (fdo#109271 > <https://bugs.freedesktop.org/show_bug.cgi?id=109271> / > i915#3002 > <https://gitlab.freedesktop.org/drm/intel/issues/3002> / > i915#4312 > <https://gitlab.freedesktop.org/drm/intel/issues/4312> / > i915#5257 > <https://gitlab.freedesktop.org/drm/intel/issues/5257> / > i915#6599 <https://gitlab.freedesktop.org/drm/intel/issues/6599>) > > {name}: This element is suppressed. This means it is ignored when > computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > > Build changes > > * Linux: CI_DRM_12089 -> Patchwork_108258v1 > > CI-20190529: 20190529 > CI_DRM_12089: 15f061f3fed969a615209a8dd343debd8410c691 @ > git://anongit.freedesktop.org/gfx-ci/linux > IGT_6648: 3c9079c0b97445fbfc903b9c5a1d69707b80af80 @ > https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_108258v1: 15f061f3fed969a615209a8dd343debd8410c691 @ > git://anongit.freedesktop.org/gfx-ci/linux > piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ > git://anongit.freedesktop.org/piglit >
On 08/09/2022 10:46, Das, Nirmoy wrote: > > On 9/8/2022 11:40 AM, Matthew Auld wrote: >> On 07/09/2022 18:26, Nirmoy Das wrote: >>> Fix regression introduced by commit: >>> "drm/i915: Individualize fences before adding to dma_resv obj" >>> which sets obj->read_domains to 0 for both read and write paths. >>> Also set obj->write_domain to 0 on read path which was removed by >>> the commit. >>> >>> References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 >>> Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding to >>> dma_resv obj") >>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> >>> Cc: <stable@vger.kernel.org> # v5.16+ >>> Cc: Matthew Auld <matthew.auld@intel.com> >>> Cc: Andrzej Hajda <andrzej.hajda@intel.com> >> >> Should I go ahead and push this? > > > Yes, please go ahead. Lots people are effected because of this regression. Pushed with: Fixes: 420a07b841d0 ("drm/i915: Individualize fences before adding to dma_resv obj") Otherwise dim complains it seems. > > > Nirmoy > >> >>> --- >>> drivers/gpu/drm/i915/i915_vma.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/i915/i915_vma.c >>> b/drivers/gpu/drm/i915/i915_vma.c >>> index 260371716490..373582cfd8f3 100644 >>> --- a/drivers/gpu/drm/i915/i915_vma.c >>> +++ b/drivers/gpu/drm/i915/i915_vma.c >>> @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma >>> *vma, >>> enum dma_resv_usage usage; >>> int idx; >>> - obj->read_domains = 0; >>> if (flags & EXEC_OBJECT_WRITE) { >>> usage = DMA_RESV_USAGE_WRITE; >>> obj->write_domain = I915_GEM_DOMAIN_RENDER; >>> + obj->read_domains = 0; >>> } else { >>> usage = DMA_RESV_USAGE_READ; >>> + obj->write_domain = 0; >>> } >>> dma_fence_array_for_each(curr, idx, fence)
On 9/8/2022 12:13 PM, Matthew Auld wrote: > On 08/09/2022 10:46, Das, Nirmoy wrote: >> >> On 9/8/2022 11:40 AM, Matthew Auld wrote: >>> On 07/09/2022 18:26, Nirmoy Das wrote: >>>> Fix regression introduced by commit: >>>> "drm/i915: Individualize fences before adding to dma_resv obj" >>>> which sets obj->read_domains to 0 for both read and write paths. >>>> Also set obj->write_domain to 0 on read path which was removed by >>>> the commit. >>>> >>>> References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 >>>> Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding >>>> to dma_resv obj") >>>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> >>>> Cc: <stable@vger.kernel.org> # v5.16+ >>>> Cc: Matthew Auld <matthew.auld@intel.com> >>>> Cc: Andrzej Hajda <andrzej.hajda@intel.com> >>> >>> Should I go ahead and push this? >> >> >> Yes, please go ahead. Lots people are effected because of this >> regression. > > Pushed with: > Fixes: 420a07b841d0 ("drm/i915: Individualize fences before adding to > dma_resv obj") > > Otherwise dim complains it seems. Thanks, Matt! Nirmoy > >> >> >> Nirmoy >> >>> >>>> --- >>>> drivers/gpu/drm/i915/i915_vma.c | 3 ++- >>>> 1 file changed, 2 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/gpu/drm/i915/i915_vma.c >>>> b/drivers/gpu/drm/i915/i915_vma.c >>>> index 260371716490..373582cfd8f3 100644 >>>> --- a/drivers/gpu/drm/i915/i915_vma.c >>>> +++ b/drivers/gpu/drm/i915/i915_vma.c >>>> @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct >>>> i915_vma *vma, >>>> enum dma_resv_usage usage; >>>> int idx; >>>> - obj->read_domains = 0; >>>> if (flags & EXEC_OBJECT_WRITE) { >>>> usage = DMA_RESV_USAGE_WRITE; >>>> obj->write_domain = I915_GEM_DOMAIN_RENDER; >>>> + obj->read_domains = 0; >>>> } else { >>>> usage = DMA_RESV_USAGE_READ; >>>> + obj->write_domain = 0; >>>> } >>>> dma_fence_array_for_each(curr, idx, fence)
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 260371716490..373582cfd8f3 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -1882,12 +1882,13 @@ int _i915_vma_move_to_active(struct i915_vma *vma, enum dma_resv_usage usage; int idx; - obj->read_domains = 0; if (flags & EXEC_OBJECT_WRITE) { usage = DMA_RESV_USAGE_WRITE; obj->write_domain = I915_GEM_DOMAIN_RENDER; + obj->read_domains = 0; } else { usage = DMA_RESV_USAGE_READ; + obj->write_domain = 0; } dma_fence_array_for_each(curr, idx, fence)
Fix regression introduced by commit: "drm/i915: Individualize fences before adding to dma_resv obj" which sets obj->read_domains to 0 for both read and write paths. Also set obj->write_domain to 0 on read path which was removed by the commit. References: https://gitlab.freedesktop.org/drm/intel/-/issues/6639 Fixes: 842d9346b2fd ("drm/i915: Individualize fences before adding to dma_resv obj") Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> Cc: <stable@vger.kernel.org> # v5.16+ Cc: Matthew Auld <matthew.auld@intel.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)