drm/i915/icl: fix icl_unmap/map_plls_to_ports
Subsystems (2)
PATCH 1/1 drm/i915/icl: fix icl_unmap/map_plls_to_ports
All connectors may not have best_encoder attached, so don't dereference encoder pointer for each connector.
--- drivers/gpu/drm/i915/intel_ddi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +4 -2
@@ -2473,9 +2473,10 @@ void icl_map_plls_to_ports(struct drm_crtc *crtc,for_each_new_connector_in_state (old_state, conn, conn_state, i) {struct intel_encoder *encoder =to_intel_encoder (conn_state->best_encoder); -enum port port = encoder->port; +enum port port;uint32_t val; + port = encoder->port;if (conn_state->crtc != crtc)continue ;
@@ -2510,11 +2511,12 @@ void icl_unmap_plls_to_ports(struct drm_crtc *crtc,for_each_old_connector_in_state (old_state, conn, old_conn_state, i) {struct intel_encoder *encoder =to_intel_encoder (old_conn_state->best_encoder); -enum port port = encoder->port; +enum port port;if (old_conn_state->crtc != crtc)continue ; + port = encoder->port;mutex_lock (&dev_priv->dpll_lock); I915_WRITE(DPCLKA_CFGCR0_ICL, I915_READ(DPCLKA_CFGCR0_ICL) |
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/icl: fix icl_unmap/map_plls_to_ports
== Series Details ==
== Series Details ==
Series: drm/i915/icl: fix icl_unmap/map_plls_to_ports
URL : https://patchwork.freedesktop.org/series/43510/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4212 -> Patchwork_9066 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9066 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9066, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43510/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9066:
=== IGT changes ===
==== Possible regressions ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-kbl-7567u: SKIP -> DMESG-FAIL
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: PASS -> SKIP
igt@kms_busy@basic-flip-a:
fi-kbl-7567u: SKIP -> PASS +30== Known issues ==
Here are the changes found in Patchwork_9066 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: PASS -> FAIL (fdo#102575)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951)
==== Possible fixes ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@gem_exec_suspend@basic-s3:
fi-kbl-7567u: DMESG-WARN (fdo#105602) -> PASS +1
igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
fi-skl-guc: FAIL (fdo#104724, fdo#103191) -> PASS fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
== Participating hosts (41 -> 39) ==
Additional (2): fi-byt-j1900 fi-hsw-peppy
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4212 -> Patchwork_9066
CI_DRM_4212: da383fb02111a4871806a3a31c4a5996243829a5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4488: 9367223d264bfba5b3aafc01d9b2b554d7d22f62 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9066: e2c6818e22099dd5fae4c9cb51100fad7f5389f7 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4488: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Linux commits ==
e2c6818e2209 drm/i915/icl: fix icl_unmap/map_plls_to_ports
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9066/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: fix icl_unmap/map_plls_to_ports
In reply to Mahesh Kumar== Series Details ==
== Series Details ==
Series: drm/i915/icl: fix icl_unmap/map_plls_to_ports
URL : https://patchwork.freedesktop.org/series/43510/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4212 -> Patchwork_9068 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9068 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9068, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43510/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9068:
=== IGT changes ===
==== Warnings ====
igt@kms_busy@basic-flip-a:
fi-kbl-7567u: SKIP -> PASS +30== Known issues ==
Here are the changes found in Patchwork_9068 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: PASS -> DMESG-WARN (fdo#105128)
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: PASS -> FAIL (fdo#102575)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-kbl-7567u: SKIP -> DMESG-FAIL (fdo#105079)
fi-cnl-y3: PASS -> DMESG-WARN (fdo#104951)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: NOTRUN -> INCOMPLETE (fdo#103713)
==== Possible fixes ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@gem_exec_suspend@basic-s3:
fi-kbl-7567u: DMESG-WARN (fdo#105602) -> PASS +1
igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
fi-skl-guc: FAIL (fdo#103191, fdo#104724) -> PASS fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105079 https://bugs.freedesktop.org/show_bug.cgi?id=105079
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
== Participating hosts (41 -> 39) ==
Additional (2): fi-byt-j1900 fi-hsw-peppy
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4212 -> Patchwork_9068
CI_DRM_4212: da383fb02111a4871806a3a31c4a5996243829a5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4488: 9367223d264bfba5b3aafc01d9b2b554d7d22f62 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9068: b1c77454075906b673de4f034495284e3d29d7a2 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4488: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Linux commits ==
b1c774540759 drm/i915/icl: fix icl_unmap/map_plls_to_ports
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9068/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: fix icl_unmap/map_plls_to_ports
In reply to Mahesh Kumar== Series Details ==
== Series Details ==
Series: drm/i915/icl: fix icl_unmap/map_plls_to_ports
URL : https://patchwork.freedesktop.org/series/43510/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4212_full -> Patchwork_9068_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9068_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9068_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43510/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9068_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: PASS -> SKIP +5
igt@kms_vblank@pipe-a-ts-continuation-modeset-rpm:
shard-apl: SKIP -> PASS +29== Known issues ==
Here are the changes found in Patchwork_9068_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
shard-kbl: PASS -> DMESG-FAIL (fdo#106560)
shard-glk: PASS -> DMESG-FAIL (fdo#106560)
igt@gem_softpin@noreloc-s3:
shard-kbl: PASS -> DMESG-WARN (fdo#103313)
igt@kms_flip@flip-vs-expired-vblank:
shard-apl: PASS -> FAIL (fdo#102887, fdo#105363)
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
==== Possible fixes ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106023, fdo#103665) -> PASS
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: FAIL (fdo#105703) -> PASS
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: FAIL (fdo#104724) -> PASS
igt@kms_vblank@pipe-c-ts-continuation-suspend:
shard-apl: DMESG-WARN (fdo#103558, fdo#105602) -> PASS +3 fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
== Participating hosts (9 -> 9) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4212 -> Patchwork_9068
CI_DRM_4212: da383fb02111a4871806a3a31c4a5996243829a5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4488: 9367223d264bfba5b3aafc01d9b2b554d7d22f62 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9068: b1c77454075906b673de4f034495284e3d29d7a2 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4488: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9068/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 14 lines · Mahesh Kumar
All connectors may not have
best_encoderattached, so don't dereference encoder pointer for each connector.Fixes c27e917e2bda (drm/i915/icl: add basic support for the ICL clocks)Signed-off-by Mahesh Kumar <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c void icl_map_plls_to_ports(struct drm_crtc *crtc, · line 2479
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-1@@ -2473,9 +2473,10 @@ void icl_map_plls_to_ports(struct drm_crtc *crtc,for_each_new_connector_in_state (old_state, conn, conn_state, i) {struct intel_encoder *encoder =to_intel_encoder (conn_state->best_encoder); -enum port port = encoder->port; +enum port port;uint32_t val; + port = encoder->port;
I presume you meant to add that line below the if statement. ;)
BR,
Jani.
Quoted 17 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-1if (conn_state->crtc != crtc)continue ;@@ -2510,11 +2511,12 @@ void icl_unmap_plls_to_ports(struct drm_crtc *crtc,for_each_old_connector_in_state (old_state, conn, old_conn_state, i) {struct intel_encoder *encoder =to_intel_encoder (old_conn_state->best_encoder); -enum port port = encoder->port; +enum port port;if (old_conn_state->crtc != crtc)continue ; + port = encoder->port;mutex_lock (&dev_priv->dpll_lock); I915_WRITE(DPCLKA_CFGCR0_ICL, I915_READ(DPCLKA_CFGCR0_ICL) |
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx