drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
Subsystems (2)
PATCH 1/1 drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
We don't have proper watermark NV12 support on ICL due to differences in how it should be implemented. In commit 234059da0f33 ("drm/i915/icl: NV12 y-plane ddb is not in same plane") we avoided writing the non-existent PLANE_NV12_BUF_CFG registers but we forgot to also avoid them on the hardware state readout. While the code is still not correct, at least now we can avoid unclaimed register error messages when dealing with RGB formats, which makes CI happier.
Also add some FIXME comments in order to make it even more clear that there's still work to do.
References: commit 234059da0f33 ("drm/i915/icl: NV12 y-plane ddb is
not in same plane")
--- drivers/gpu/drm/i915/intel_pm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +7 -1
@@ -3909,7 +3909,12 @@ skl_ddb_get_hw_plane_state(struct drm_i915_private *dev_priv, val & PLANE_CTL_ALPHA_MASK); val =I915_READ (PLANE_BUF_CFG (pipe, plane_id)); - val2 =I915_READ (PLANE_NV12_BUF_CFG (pipe, plane_id)); +/* +* FIXME: add proper NV12 support for ICL. Avoid reading unclaimed +* registers for now. +*/ +if (INTEL_GEN (dev_priv) <11 ) + val2 =I915_READ (PLANE_NV12_BUF_CFG (pipe, plane_id));if (fourcc ==DRM_FORMAT_NV12 ) { skl_ddb_entry_init_from_hw(dev_priv,
@@ -4977,6 +4982,7 @@ static void skl_write_plane_wm(struct intel_crtc *intel_crtc,skl_ddb_entry_write (dev_priv,PLANE_BUF_CFG (pipe, plane_id), &ddb->plane[pipe][plane_id]); +/* FIXME: add proper NV12 support for ICL. */ if (INTEL_GEN (dev_priv) >=11 ) return skl_ddb_entry_write(dev_priv, PLANE_BUF_CFG(pipe, plane_id),
Signature · 6 lines
2.14.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
== Series Details ==
== Series Details ==
Series: drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
URL : https://patchwork.freedesktop.org/series/47520/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4600 -> Patchwork_9828 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47520/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9828 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_guc:
fi-skl-guc: NOTRUN -> DMESG-WARN (fdo#107258, fdo#107175)
igt@drv_selftest@live_workarounds:
fi-cnl-psr: PASS -> DMESG-FAIL (fdo#107292)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: NOTRUN -> FAIL (fdo#100368)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-kbl-guc: DMESG-FAIL (fdo#106947) -> PASS
fi-skl-6260u: DMESG-FAIL (fdo#107174, fdo#106560) -> PASS
igt@drv_selftest@live_workarounds:
{fi-cfl-8109u}: DMESG-FAIL (fdo#107292) -> PASS
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-FAIL (fdo#106103, fdo#102614) -> PASS
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
fi-skl-6700k2: FAIL (fdo#103191) -> PASS
==== Warnings ====
{igt@kms_psr@primary_page_flip}:
fi-cnl-psr: DMESG-FAIL (fdo#107372) -> DMESG-WARN (fdo#107372) {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107174 https://bugs.freedesktop.org/show_bug.cgi?id=107174
fdo#107175 https://bugs.freedesktop.org/show_bug.cgi?id=107175
fdo#107258 https://bugs.freedesktop.org/show_bug.cgi?id=107258
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
== Participating hosts (48 -> 45) ==
Additional (2): fi-skl-guc fi-glk-j4005
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-byt-clapper fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4600 -> Patchwork_9828
CI_DRM_4600: 308427119c70d0aaa90433b05969a0317165b122 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9828: a28e77d4b74217285bd1e4f954063a59830e3a6c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a28e77d4b742 drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9828/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: avoid unclaimed PLANE_NV12_BUF_CFG register
URL : https://patchwork.freedesktop.org/series/47520/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4600_full -> Patchwork_9828_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_9828_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
shard-kbl: PASS -> DMESG-FAIL (fdo#106947, fdo#106560)
igt@gem_ctx_isolation@vcs0-s3:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#105189)
igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
shard-glk: PASS -> FAIL (fdo#103375)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-glk: FAIL (fdo#106886) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-glk: FAIL (fdo#105312) -> PASS
igt@kms_flip@wf_vblank-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
igt@pm_rps@min-max-config-loaded:
shard-apl: FAIL (fdo#102250) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102250 https://bugs.freedesktop.org/show_bug.cgi?id=102250
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105312 https://bugs.freedesktop.org/show_bug.cgi?id=105312
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4600 -> Patchwork_9828
CI_DRM_4600: 308427119c70d0aaa90433b05969a0317165b122 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9828: a28e77d4b74217285bd1e4f954063a59830e3a6c @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9828/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
-Mahesh
Quoted 38 lines · Paulo Zanoni
We don't have proper watermark NV12 support on ICL due to differences in how it should be implemented. In commit
234059da0f33("drm/i915/icl: NV12 y-plane ddb is not in same plane") we avoided writing the non-existentPLANE_NV12_BUF_CFGregisters but we forgot to also avoid them on the hardware state readout. While the code is still not correct, at least now we can avoid unclaimed register error messages when dealing with RGB formats, which makes CI happier.Also add some FIXME comments in order to make it even more clear that there's still work to do.
References: commit
234059da0f33("drm/i915/icl: NV12 y-plane ddb is
not in same plane")Cc Mahesh Kumar <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +6
-1@@ -3909,7 +3909,12 @@ skl_ddb_get_hw_plane_state(struct drm_i915_private *dev_priv, val & PLANE_CTL_ALPHA_MASK); val =I915_READ (PLANE_BUF_CFG (pipe, plane_id)); - val2 =I915_READ (PLANE_NV12_BUF_CFG (pipe, plane_id)); +/* +* FIXME: add proper NV12 support for ICL. Avoid reading unclaimed +* registers for now. +*/ +if (INTEL_GEN (dev_priv) <11 ) + val2 =I915_READ (PLANE_NV12_BUF_CFG (pipe, plane_id));if (fourcc ==DRM_FORMAT_NV12 ) { skl_ddb_entry_init_from_hw(dev_priv,
drivers/gpu/drm/i915/intel_pm.c static void skl_write_plane_wm(struct intel_crtc *intel_crtc, · line 4988
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4977,6 +4982,7 @@ static void skl_write_plane_wm(struct intel_crtc *intel_crtc,skl_ddb_entry_write (dev_priv,PLANE_BUF_CFG (pipe, plane_id), &ddb->plane[pipe][plane_id]); +/* FIXME: add proper NV12 support for ICL. */ if (INTEL_GEN (dev_priv) >=11 ) return skl_ddb_entry_write(dev_priv, PLANE_BUF_CFG(pipe, plane_id),
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx