drm/i915: Generalize transcoder looping
Subsystems (2)
PATCH v2 1/1 drm/i915: Generalize transcoder looping
To make looping through transcoders in intel_ddi.c more generic, let's switch to use 'for_each_pipe()' macro to do this.
v2: Add a notion that we are dealing with transcoders instead of pipes (Jani)
--- drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +7 -4
@@ -1681,8 +1681,9 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = encoder->port; +enum pipe p; +enum transcoder cpu_transcoder;u32 tmp; -int i;bool ret; if (!intel_display_power_get_if_enabled(dev_priv,
@@ -1717,15 +1718,17 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, goto out; } -for (i =TRANSCODER_A ; i <=TRANSCODER_C ; i++) { - tmp =I915_READ (TRANS_DDI_FUNC_CTL (i)); +for_each_pipe (dev_priv, p) { + cpu_transcoder = (enum transcoder ) p; + + tmp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if ((tmp &TRANS_DDI_PORT_MASK ) ==TRANS_DDI_SELECT_PORT (port)) {if ((tmp &TRANS_DDI_MODE_SELECT_MASK ) ==TRANS_DDI_MODE_SELECT_DP_MST ) goto out; - *pipe = i; + *pipe = p; ret = true; goto out;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Generalize transcoder looping (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915: Generalize transcoder looping (rev2)
URL : https://patchwork.freedesktop.org/series/32965/
State : failure
== Summary ==
Series 32965v2 drm/i915: Generalize transcoder looping
https://patchwork.freedesktop.org/api/1.0/series/32965/revisions/2/mbox/
Test gem_exec_parallel:
Subgroup basic:
pass -> DMESG-FAIL (fi-glk-dsi)
Test gem_exec_reloc:
Subgroup basic-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-softpin:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_store:
Subgroup basic-all:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-blt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-bsd:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-render:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-vebox:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_suspend:
Subgroup basic:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-s3:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-s4-devices:
pass -> SKIP (fi-glk-dsi)
Test gem_linear_blits:
Subgroup basic:
pass -> SKIP (fi-glk-dsi)
Test gem_render_linear_blits:
Subgroup basic:
pass -> SKIP (fi-glk-dsi)
Test gem_render_tiled_blits:
Subgroup basic:
pass -> SKIP (fi-glk-dsi)
Test gem_ringfill:
Subgroup basic-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-default-interruptible:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-default-forked:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-default-fd:WARNING: Long output truncated
9cc9686b44e192d2561a513f84d5ac95518cad73 drm-tip: 2017y-11m-06d-10h-10m-17s UTC integration manifest 3d0c67d697a9 drm/i915: Generalize transcoder looping
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6974/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Generalize transcoder looping (rev2)
In reply to Mika Kahola== Series Details ==
== Series Details ==
Series: drm/i915: Generalize transcoder looping (rev2)
URL : https://patchwork.freedesktop.org/series/32965/
State : success
== Summary ==
Series 32965v2 drm/i915: Generalize transcoder looping
https://patchwork.freedesktop.org/api/1.0/series/32965/revisions/2/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:449s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:531s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:274s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:510s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:500s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:510s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:495s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:551s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:430s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:258s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:591s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:429s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:432s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:430s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:496s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:468s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:580s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:589s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:577s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:462s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:597s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:652s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:523s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:504s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:574s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s Blacklisted hosts: fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:617s fi-glk-dsi total:289 pass:192 dwarn:1 dfail:4 fail:0 skip:92 time:425s
9cc9686b44e192d2561a513f84d5ac95518cad73 drm-tip: 2017y-11m-06d-10h-10m-17s UTC integration manifest 3d0c67d697a9 drm/i915: Generalize transcoder looping
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6974/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Mika Kahola
To make looping through transcoders in
intel_ddi.cmore generic, let's switch to use 'for_each_pipe()' macro to do this.v2: Add a notion that we are dealing with transcoders instead of pipes (Jani)
Signed-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c bool intel_ddi_get_hw_state(struct intel_encoder *encoder, · line 1685
Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -1681,8 +1681,9 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = encoder->port; +enum pipe p; +enum transcoder cpu_transcoder;
cpu_transcoder isn't needed outside the loop. So we can tighten the scope a bit.
With that
Quoted 33 lines
drivers/gpu/drm/i915/intel_ddi.c +5
-4u32 tmp; -int i;bool ret; if (!intel_display_power_get_if_enabled(dev_priv,@@ -1717,15 +1718,17 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, goto out; } -for (i =TRANSCODER_A ; i <=TRANSCODER_C ; i++) { - tmp =I915_READ (TRANS_DDI_FUNC_CTL (i)); +for_each_pipe (dev_priv, p) { + cpu_transcoder = (enum transcoder ) p; + + tmp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if ((tmp &TRANS_DDI_PORT_MASK ) ==TRANS_DDI_SELECT_PORT (port)) {if ((tmp &TRANS_DDI_MODE_SELECT_MASK ) ==TRANS_DDI_MODE_SELECT_DP_MST ) goto out; - *pipe = i; + *pipe = p; ret = true; goto out;Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Ville Syrjälä
Quoted 13 lines · Mika Kahola
To make looping through transcoders in
intel_ddi.cmore generic, let's switch
to use 'for_each_pipe()' macro to do this.v2: Add a notion that we are dealing with transcoders instead of pipes (Jani)
Signed-off-by Mika Kahola <[email protected]>---
drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++----1 file changed, 7 insertions(+), 4 deletions(-)
Quoted 14 lines
drivers/gpu/drm/i915/intel_ddi.c bool intel_ddi_get_hw_state(struct · line 1686
Quoted 12 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -1681,8 +1681,9 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); enum port port = encoder->port; +enum pipe p; +enum transcoder cpu_transcoder;
cpu_transcoderisn't needed outside the loop. So we can tighten the scope a bit.
Thanks for the review! I'll make the change and respin it for CI.
Quoted 41 lines
With that
Reviewed-by Ville Syrjälä <[email protected]>Quoted 37 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-1u32 tmp; -int i; bool ret;
if (!intel_display_power_get_if_enabled(dev_priv,drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1717,15 +1718,17 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, goto out; }drivers/gpu/drm/i915/intel_ddi.c +4
-2-for (i =TRANSCODER_A ; i <=TRANSCODER_C ; i++) { - tmp =I915_READ (TRANS_DDI_FUNC_CTL (i)); +for_each_pipe (dev_priv, p) { + cpu_transcoder = (enum transcoder ) p; + + tmp =I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
if ((tmp &TRANS_DDI_PORT_MASK) ==TRANS_DDI_SELECT_PORT(port)) {
if ((tmp &TRANS_DDI_MODE_SELECT_MASK) ==TRANS_DDI_MODE_SELECT_DP_MST) goto out;drivers/gpu/drm/i915/intel_ddi.c +1
-1- *pipe = i; + *pipe = p;ret = true;
goto out;
--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx