drm/i915: Call MG_DP_MODE() macro with the right parameters order
Subsystems (2)
PATCH 1/1 drm/i915: Call MG_DP_MODE() macro with the right parameters order
The commit that this patch fixes changed the order of the parameters of MG_DP_MODE() but din't update the callers, breaking type-c on ICL.
--- drivers/gpu/drm/i915/intel_ddi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +5 -5
@@ -2928,7 +2928,7 @@ static void icl_enable_phy_clock_gating(struct intel_digital_port *dig_port)struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);enum port port = dig_port->base.port;enum tc_port tc_port =intel_port_to_tc (dev_priv, port); -i915_reg_t mg_regs[2 ] = {MG_DP_MODE (port,0 ),MG_DP_MODE (port,1 ) }; +i915_reg_t mg_regs[2 ] = {MG_DP_MODE (0 , port),MG_DP_MODE (1 , port) };u32 val;int i;
@@ -2999,8 +2999,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)if (tc_port ==PORT_TC_NONE || intel_dig_port->tc_type ==TC_PORT_TBT )return ; - ln0 =I915_READ (MG_DP_MODE (port,0 )); - ln1 =I915_READ (MG_DP_MODE (port,1 )); + ln0 =I915_READ (MG_DP_MODE (0 , port)); + ln1 =I915_READ (MG_DP_MODE (1 , port));switch (intel_dig_port->tc_type) {case TC_PORT_TYPEC :
@@ -3050,8 +3050,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)return ; } -I915_WRITE (MG_DP_MODE (port,0 ), ln0); -I915_WRITE (MG_DP_MODE (port,1 ), ln1); +I915_WRITE (MG_DP_MODE (0 , port), ln0); +I915_WRITE (MG_DP_MODE (1 , port), ln1); } static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Call MG_DP_MODE() macro with the right parameters order
== Series Details ==
== Series Details ==
Series: drm/i915: Call MG_DP_MODE() macro with the right parameters order
URL : https://patchwork.freedesktop.org/series/57107/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5654 -> Patchwork_12285
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/57107/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12285 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@memory-alloc:
- fi-ivb-3520m: NOTRUN -> SKIP [fdo#109271] +48
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@i915_module_load@reload-no-display:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] +1
* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#105602]
* igt@kms_chamelium@dp-hpd-fast:
- fi-skl-6700k2: NOTRUN -> SKIP [fdo#109271] +41
* igt@runner@aborted:
- fi-kbl-7567u: NOTRUN -> FAIL [fdo#105602]
#### Possible fixes ####
* igt@i915_selftest@live_evict:
- fi-bsw-kefka: DMESG-WARN [fdo#107709] -> PASS
#### Warnings ####
* igt@i915_selftest@live_contexts:
- fi-icl-u3: DMESG-FAIL [fdo#108569] -> INCOMPLETE [fdo#108569]
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
Participating hosts (43 -> 38)
------------------------------
Additional (2): fi-ivb-3520m fi-skl-6700k2
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5654 -> Patchwork_12285
CI_DRM_5654: 30c7f283790b433aa311ef7a7d2b6b428886fb9a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4851: 2b7dd10a4e2ea0cabff68421fd15e96c99be3cad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12285: 09b96cee7c1efd9a873cacea5e3b378bf262a759 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
09b96cee7c1e drm/i915: Call MG_DP_MODE() macro with the right parameters order
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12285/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · José Roberto de Souza
The commit that this patch fixes changed the order of the parameters of
MG_DP_MODE()but din't update the callers, breaking type-c on ICL.
ugh...
Quoted 2 lines
Fixes 58106b7d816e ("drm/i915: Make MG PHY macros semantically consistent")
From a quick grep in the commit:
git show 58106b7d816e | grep "^+#define" +#define MG_PHY_PORT_LN(ln, port, ln0p1, ln0p2, ln1p1) \
+#define MG_TX1_LINK_PARAMS(ln, port) \
+#define MG_TX2_LINK_PARAMS(ln, port) \
+#define MG_TX1_PISO_READLOAD(ln, port) \
+#define MG_TX2_PISO_READLOAD(ln, port) \
+#define MG_TX1_SWINGCTRL(ln, port) \
+#define MG_TX2_SWINGCTRL(ln, port) \
+#define MG_TX1_DRVCTRL(ln, port) \
+#define MG_TX2_DRVCTRL(ln, port) \
+#define MG_CLKHUB(ln, port) \
+#define MG_TX1_DCC(ln, port) \
+#define MG_TX2_DCC(ln, port) \
+#define MG_DP_MODE(ln, port) \
Going through each of those, it seems MG_DP_MODE() was indeed the only one left behind. Could you double check?
thanks
Lucas De Marchi
Quoted 53 lines
Cc Clint Taylor <[email protected]>Cc Imre Deak <[email protected]>Cc Jani Nikula <[email protected]>Cc Aditya Swarup <[email protected]>Cc Manasi navare <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +5
-6@@ -2928,7 +2928,7 @@ static void icl_enable_phy_clock_gating(struct intel_digital_port *dig_port)struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);enum port port = dig_port->base.port;enum tc_port tc_port =intel_port_to_tc (dev_priv, port); -i915_reg_t mg_regs[2 ] = {MG_DP_MODE (port,0 ),MG_DP_MODE (port,1 ) }; +i915_reg_t mg_regs[2 ] = {MG_DP_MODE (0 , port),MG_DP_MODE (1 , port) };u32 val;int i;@@ -2999,8 +2999,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)if (tc_port ==PORT_TC_NONE || intel_dig_port->tc_type ==TC_PORT_TBT )return ; - ln0 =I915_READ (MG_DP_MODE (port,0 )); - ln1 =I915_READ (MG_DP_MODE (port,1 )); + ln0 =I915_READ (MG_DP_MODE (0 , port)); + ln1 =I915_READ (MG_DP_MODE (1 , port));switch (intel_dig_port->tc_type) {case TC_PORT_TYPEC :@@ -3050,8 +3050,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)return ; } -I915_WRITE (MG_DP_MODE (port,0 ), ln0); -I915_WRITE (MG_DP_MODE (port,1 ), ln1); +I915_WRITE (MG_DP_MODE (0 , port), ln0); +I915_WRITE (MG_DP_MODE (1 , port), ln1); } static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp, --2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Lucas De Marchi _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Lucas De Marchi
Quoted 3 lines · José Roberto de Souza
The commit that this patch fixes changed the order of the parameters of
MG_DP_MODE()but din't update the callers, breaking type-c on ICL.ugh...
Quoted 2 lines
Fixes 58106b7d816e ("drm/i915: Make MG PHY macros semantically consistent")From a quick grep in the commit:
git show58106b7d816e| grep "^+#define"(quoted diff) +13
-0+#define MG_PHY_PORT_LN(ln, port, ln0p1, ln0p2, ln1p1) \ +#define MG_TX1_LINK_PARAMS(ln, port) \ +#define MG_TX2_LINK_PARAMS(ln, port) \ +#define MG_TX1_PISO_READLOAD(ln, port) \ +#define MG_TX2_PISO_READLOAD(ln, port) \ +#define MG_TX1_SWINGCTRL(ln, port) \ +#define MG_TX2_SWINGCTRL(ln, port) \ +#define MG_TX1_DRVCTRL(ln, port) \ +#define MG_TX2_DRVCTRL(ln, port) \ +#define MG_CLKHUB(ln, port) \ +#define MG_TX1_DCC(ln, port) \ +#define MG_TX2_DCC(ln, port) \ +#define MG_DP_MODE(ln, port) \
Quoted 2 lines
Going through each of those, it seems
MG_DP_MODE()was indeed the only one left behind. Could you double check?
I double checked this as well as 9194e42a1837 ("drm/i915: Make combo PHY DDI macro definitions consistent for ICL and CNL"). Seems to be all right now.
Arguably I should've done this when I pushed the change, but I only did some spot checks as I trusted the Reviewed-by.
Quoted 1 line
Reviewed-by Lucas De Marchi <[email protected]>
Thanks for the patch and review, pushed.
BR,
Jani.
Quoted 57 lines
thanks
Lucas De MarchiQuoted 53 lines
Cc Clint Taylor <[email protected]>Cc Imre Deak <[email protected]>Cc Jani Nikula <[email protected]>Cc Aditya Swarup <[email protected]>Cc Manasi navare <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +5
-6@@ -2928,7 +2928,7 @@ static void icl_enable_phy_clock_gating(struct intel_digital_port *dig_port)struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);enum port port = dig_port->base.port;enum tc_port tc_port =intel_port_to_tc (dev_priv, port); -i915_reg_t mg_regs[2 ] = {MG_DP_MODE (port,0 ),MG_DP_MODE (port,1 ) }; +i915_reg_t mg_regs[2 ] = {MG_DP_MODE (0 , port),MG_DP_MODE (1 , port) };u32 val;int i;@@ -2999,8 +2999,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)if (tc_port ==PORT_TC_NONE || intel_dig_port->tc_type ==TC_PORT_TBT )return ; - ln0 =I915_READ (MG_DP_MODE (port,0 )); - ln1 =I915_READ (MG_DP_MODE (port,1 )); + ln0 =I915_READ (MG_DP_MODE (0 , port)); + ln1 =I915_READ (MG_DP_MODE (1 , port));switch (intel_dig_port->tc_type) {case TC_PORT_TYPEC :@@ -3050,8 +3050,8 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)return ; } -I915_WRITE (MG_DP_MODE (port,0 ), ln0); -I915_WRITE (MG_DP_MODE (port,1 ), ln1); +I915_WRITE (MG_DP_MODE (0 , port), ln0); +I915_WRITE (MG_DP_MODE (1 , port), ln1); } static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp, --2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Call MG_DP_MODE() macro with the right parameters order
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: drm/i915: Call MG_DP_MODE() macro with the right parameters order
URL : https://patchwork.freedesktop.org/series/57107/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5654_full -> Patchwork_12285_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12285_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_param@invalid-param-get:
- shard-kbl: NOTRUN -> FAIL [fdo#109559]
* igt@gem_exec_big:
- shard-hsw: PASS -> TIMEOUT [fdo#107937]
* igt@i915_pm_lpsp@edp-panel-fitter:
- shard-iclb: NOTRUN -> SKIP [fdo#109301]
* igt@i915_pm_rpm@reg-read-ioctl:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] +5
* igt@kms_busy@basic-flip-e:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_busy@extended-modeset-hang-oldfb-with-reset-render-f:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-glk: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_chamelium@vga-hpd-fast:
- shard-iclb: NOTRUN -> SKIP [fdo#109284]
* igt@kms_chv_cursor_fail@pipe-c-256x256-bottom-edge:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +4
* igt@kms_color@pipe-a-legacy-gamma:
- shard-apl: PASS -> FAIL [fdo#104782] / [fdo#108145]
* igt@kms_content_protection@legacy:
- shard-kbl: NOTRUN -> FAIL [fdo#108597] / [fdo#108739]
* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232] +2
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-apl: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: PASS -> FAIL [fdo#105767]
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank:
- shard-iclb: NOTRUN -> SKIP [fdo#109274]
* igt@kms_flip@2x-flip-vs-dpms-interruptible:
- shard-hsw: PASS -> DMESG-WARN [fdo#102614]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-kbl: PASS -> FAIL [fdo#102887] / [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-render:
- shard-glk: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +2
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +31
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-gtt:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +46
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-iclb: PASS -> FAIL [fdo#103167] +4
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-fullscreen:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +16
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-iclb: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-apl: PASS -> FAIL [fdo#103166] +2
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: PASS -> FAIL [fdo#109016]
* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]
#### Possible fixes ####
* igt@i915_pm_rpm@fences:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS +1
* igt@kms_flip@flip-vs-expired-vblank:
- shard-iclb: FAIL [fdo#105363] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-iclb: FAIL [fdo#103167] -> PASS +3
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
- shard-iclb: FAIL [fdo#103166] -> PASS +4
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
* igt@kms_vblank@pipe-b-query-idle-hang:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
#### Warnings ####
* igt@i915_pm_backlight@fade_with_suspend:
- shard-iclb: DMESG-FAIL [fdo#107724] / [fdo#107847] -> FAIL [fdo#107847]
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-iclb: SKIP [fdo#109308] -> INCOMPLETE [fdo#108840]
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-iclb: INCOMPLETE [fdo#107713] -> FAIL [fdo#103232]
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107847]: https://bugs.freedesktop.org/show_bug.cgi?id=107847
[fdo#107937]: https://bugs.freedesktop.org/show_bug.cgi?id=107937
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108597]: https://bugs.freedesktop.org/show_bug.cgi?id=108597
[fdo#108739]: https://bugs.freedesktop.org/show_bug.cgi?id=108739
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109301]: https://bugs.freedesktop.org/show_bug.cgi?id=109301
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109559]: https://bugs.freedesktop.org/show_bug.cgi?id=109559
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 6)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* Linux: CI_DRM_5654 -> Patchwork_12285
CI_DRM_5654: 30c7f283790b433aa311ef7a7d2b6b428886fb9a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4851: 2b7dd10a4e2ea0cabff68421fd15e96c99be3cad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12285: 09b96cee7c1efd9a873cacea5e3b378bf262a759 @ 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_12285/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx