drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
Subsystems (2)
PATCH 1/1 drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
From: Ville Syrjälä <[email protected]>
We don't use the enum i9xx_plane_id namespace on SKL+ anymore, so do not initialize the related plane_to_crtc_mapping[] table either.
Actually the only remaining user of that table is the pre-g4x watermark code, but no harm in initializing the table on all pre-SKL platforms.
--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +11 -4
@@ -13572,10 +13572,17 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)/* initialize shared scalers */ intel_crtc_init_scalers (intel_crtc, crtc_state); -BUG_ON (pipe >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] !=NULL ); - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] = intel_crtc; - dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = intel_crtc; +BUG_ON (pipe >=ARRAY_SIZE (dev_priv->pipe_to_crtc_mapping) || + dev_priv->pipe_to_crtc_mapping[pipe] !=NULL ); + dev_priv->pipe_to_crtc_mapping[pipe] = intel_crtc; + +if (INTEL_GEN (dev_priv) <9 ) { +enum i9xx_plane_id i9xx_plane = primary->i9xx_plane; + +BUG_ON (i9xx_plane >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || + dev_priv->plane_to_crtc_mapping[i9xx_plane] !=NULL ); + dev_priv->plane_to_crtc_mapping[i9xx_plane] = intel_crtc; + }drm_crtc_helper_add (&intel_crtc->base, &intel_helper_funcs);
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
== Series Details ==
== Series Details ==
Series: drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
URL : https://patchwork.freedesktop.org/series/39393/
State : success
== Summary ==
Series 39393v1 drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
https://patchwork.freedesktop.org/api/1.0/series/39393/revisions/1/mbox/
---- Known issues:
Test prime_vgem:
Subgroup basic-fence-flip:
fail -> PASS (fi-ilk-650) fdo#104008fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:415s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:426s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:373s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:485s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:476s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:486s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:465s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:455s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:392s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:559s fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:500s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:566s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:412s fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:289s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:503s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:385s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:413s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:449s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:412s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:457s fi-kbl-7560u total:108 pass:104 dwarn:0 dfail:0 fail:0 skip:3 fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:446s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:491s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:583s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:424s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:499s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:516s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:483s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:408s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:425s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:529s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:388s
4a3784737699f45784335e1c9446596bf7833606 drm-tip: 2018y-03m-05d-14h-32m-57s UTC integration manifest 1179eef185c2 drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8234/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+
URL : https://patchwork.freedesktop.org/series/39393/
State : warning
== Summary ==
---- Possible new issues:
Test kms_concurrent:
Subgroup pipe-b:
pass -> SKIP (shard-snb)
Test kms_vblank:
Subgroup pipe-a-ts-continuation-modeset:
skip -> PASS (shard-snb)---- Known issues:
Test gem_eio:
Subgroup in-flight-external:
pass -> INCOMPLETE (shard-apl) fdo#104945
Test kms_chv_cursor_fail:
Subgroup pipe-b-64x64-top-edge:
pass -> DMESG-WARN (shard-snb) fdo#105185 +1
Subgroup pipe-c-128x128-bottom-edge:
pass -> FAIL (shard-apl) fdo#104671
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-atomic:
skip -> PASS (shard-snb) fdo#102670
Test kms_flip:
Subgroup dpms-vs-vblank-race:
fail -> PASS (shard-hsw) fdo#103060
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> FAIL (shard-apl) fdo#103167fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
shard-apl total:3412 pass:1798 dwarn:1 dfail:0 fail:9 skip:1602 time:11999s shard-hsw total:3468 pass:1774 dwarn:1 dfail:0 fail:1 skip:1691 time:11739s shard-snb total:3468 pass:1363 dwarn:2 dfail:0 fail:1 skip:2102 time:7083s
Blacklisted hosts:
shard-kbl total:3270 pass:1842 dwarn:1 dfail:0 fail:7 skip:1416 time:8206s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8234/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 26 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
We don't use the enum
i9xx_plane_idnamespace on SKL+ anymore, so do not initialize the related plane_to_crtc_mapping[] table either.Actually the only remaining user of that table is the pre-g4x watermark code, but no harm in initializing the table on all pre-SKL platforms.
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-4@@ -13572,10 +13572,17 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)/* initialize shared scalers */ intel_crtc_init_scalers (intel_crtc, crtc_state); -BUG_ON (pipe >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] !=NULL ); - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] = intel_crtc; - dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = intel_crtc;
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13584
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+BUG_ON (pipe >=ARRAY_SIZE (dev_priv->pipe_to_crtc_mapping) || + dev_priv->pipe_to_crtc_mapping[pipe] !=NULL ); + dev_priv->pipe_to_crtc_mapping[pipe] = intel_crtc; + +if (INTEL_GEN (dev_priv) <9 ) { +enum i9xx_plane_id i9xx_plane = primary->i9xx_plane; + +BUG_ON (i9xx_plane >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || + dev_priv->plane_to_crtc_mapping[i9xx_plane] !=NULL ); + dev_priv->plane_to_crtc_mapping[i9xx_plane] = intel_crtc;
Verified that plane_to_crtc_mapping[i9xx_plane] is used only in pre-gen9 code. Patch looks harmless
Should intel_get_crtc_for_plane be renamed to i9xx_get_crtc_for_plane()? and the table as i9xx_plane_to_crtc_mapping[]?
drivers/gpu/drm/i915/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13588
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+ }drm_crtc_helper_add (&intel_crtc->base, &intel_helper_funcs);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 44 lines · Dhinakaran
Quoted 26 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
We don't use the enum
i9xx_plane_idnamespace on SKL+ anymore, so do not initialize the related plane_to_crtc_mapping[] table either.Actually the only remaining user of that table is the pre-g4x watermark code, but no harm in initializing the table on all pre-SKL platforms.
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-4@@ -13572,10 +13572,17 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)/* initialize shared scalers */ intel_crtc_init_scalers (intel_crtc, crtc_state); -BUG_ON (pipe >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] !=NULL ); - dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] = intel_crtc; - dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = intel_crtc;drivers/gpu/drm/i915/intel_display.c static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13584
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+BUG_ON (pipe >=ARRAY_SIZE (dev_priv->pipe_to_crtc_mapping) || + dev_priv->pipe_to_crtc_mapping[pipe] !=NULL ); + dev_priv->pipe_to_crtc_mapping[pipe] = intel_crtc; + +if (INTEL_GEN (dev_priv) <9 ) { +enum i9xx_plane_id i9xx_plane = primary->i9xx_plane; + +BUG_ON (i9xx_plane >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || + dev_priv->plane_to_crtc_mapping[i9xx_plane] !=NULL ); + dev_priv->plane_to_crtc_mapping[i9xx_plane] = intel_crtc;Verified that plane_to_crtc_mapping[i9xx_plane] is used only in pre-gen9 code. Patch looks harmless
Quoted 4 lines
Reviewed-by Dhinakaran Pandiyan <[email protected]>Should
intel_get_crtc_for_planebe renamed toi9xx_get_crtc_for_plane()? and the table as i9xx_plane_to_crtc_mapping[]?
I'm going to nuke this thing entirely at some point. So I don't think I'll bother with a rename, but if someone else wants to do it I certainly won't object.
Thanks for the review. Patch pushed to dinq.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx