drm/i915/cnl: Removing missing DDI_E bits from CNL.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/cnl: Removing missing DDI_E bits from CNL.
DDI_E is not supported on CNL-U and CNL-Y
When adding the inital support we noticed DDI_E wasn't supported and removed it on v4 and v5 of that patch.
However for some reason I missed or put back these 2 chunks.
Time to clean it up to avoid later confusion.
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +0 -2
@@ -1796,7 +1796,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,BIT_ULL (POWER_DOMAIN_PORT_DDI_B_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_C_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_D_LANES ) | \ -BIT_ULL (POWER_DOMAIN_PORT_DDI_E_LANES ) | \BIT_ULL (POWER_DOMAIN_AUX_B ) | \BIT_ULL (POWER_DOMAIN_AUX_C ) | \ BIT_ULL(POWER_DOMAIN_AUX_D) | \
@@ -1805,7 +1804,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO) | \ BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_B_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO) | \
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/cnl: Removing missing DDI_E bits from CNL.
== Series Details ==
== Series Details ==
Series: drm/i915/cnl: Removing missing DDI_E bits from CNL.
URL : https://patchwork.freedesktop.org/series/28341/
State : failure
== Summary ==
Series 28341v1 drm/i915/cnl: Removing missing DDI_E bits from CNL.
https://patchwork.freedesktop.org/api/1.0/series/28341/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test gem_linear_blits:
Subgroup basic:
pass -> INCOMPLETE (fi-bxt-j4205)
Test kms_busy:
Subgroup basic-flip-default-a:
pass -> DMESG-WARN (fi-skl-6700hq) fdo#101144
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
dmesg-warn -> PASS (fi-pnv-d510) fdo#101597 +1fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fi-bdw-5557u total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:437s fi-bdw-gvtdvm total:280 pass:266 dwarn:0 dfail:0 fail:0 skip:14 time:416s fi-blb-e6850 total:280 pass:225 dwarn:1 dfail:0 fail:0 skip:54 time:355s fi-bsw-n3050 total:280 pass:244 dwarn:0 dfail:0 fail:0 skip:36 time:481s fi-bxt-j4205 total:116 pass:104 dwarn:0 dfail:0 fail:0 skip:11 fi-byt-j1900 total:280 pass:255 dwarn:1 dfail:0 fail:0 skip:24 time:517s fi-byt-n2820 total:280 pass:251 dwarn:1 dfail:0 fail:0 skip:28 time:501s fi-glk-2a total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:579s fi-hsw-4770 total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:428s fi-hsw-4770r total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:406s fi-ilk-650 total:280 pass:230 dwarn:0 dfail:0 fail:0 skip:50 time:420s fi-ivb-3520m total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:503s fi-ivb-3770 total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7500u total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:455s fi-kbl-7560u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:562s fi-kbl-r total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:571s fi-pnv-d510 total:280 pass:223 dwarn:2 dfail:0 fail:0 skip:55 time:557s fi-skl-6260u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:450s fi-skl-6700hq total:280 pass:262 dwarn:1 dfail:0 fail:0 skip:17 time:579s fi-skl-6700k total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:627s fi-skl-6770hq total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:460s fi-skl-gvtdvm total:280 pass:267 dwarn:0 dfail:0 fail:0 skip:13 time:427s fi-skl-x1585l total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:484s fi-snb-2520m total:280 pass:252 dwarn:0 dfail:0 fail:0 skip:28 time:545s fi-snb-2600 total:280 pass:251 dwarn:0 dfail:0 fail:0 skip:29 time:407s
f27d7948f25a650ec580fd73a5dafb679af455fc drm-tip: 2017y-08m-03d-19h-30m-44s UTC integration manifest 85bef63b7a8f drm/i915/cnl: Removing missing DDI_E bits from CNL.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5323/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Rodrigo Vivi
DDI_Eis not supported on CNL-U and CNL-YWhen adding the inital support we noticed
DDI_Ewasn't supported and removed it on v4 and v5 of that patch.
However for some reason I missed or put back these 2 chunks.Time to clean it up to avoid later confusion.
Quoted 7 lines
Fixes 8bcd3dd41766 ("drm/i915/cnl: Add power wells for CNL")Cc Clint Taylor <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Imre Deak <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Looks ok and also the correct thing for CNL_H/S, where the port E DDI power well is separate from port A and not dependent on power well #2 (unlike SKL):
Quoted 27 lines
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/intel_runtime_pm.c +0
-2@@ -1796,7 +1796,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,BIT_ULL (POWER_DOMAIN_PORT_DDI_B_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_C_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_D_LANES ) | \ -BIT_ULL (POWER_DOMAIN_PORT_DDI_E_LANES ) | \BIT_ULL (POWER_DOMAIN_AUX_B ) | \BIT_ULL (POWER_DOMAIN_AUX_C ) | \ BIT_ULL(POWER_DOMAIN_AUX_D) | \@@ -1805,7 +1804,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO) | \ BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_B_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO) | \Signature · 1 line
2.13.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
Appliedmerged to dinq, thanks for the review.
Quoted 54 lines · Imre Deak
Quoted 8 lines · Rodrigo Vivi
DDI_Eis not supported on CNL-U and CNL-YWhen adding the inital support we noticed
DDI_Ewasn't supported and removed it on v4 and v5 of that patch.
However for some reason I missed or put back these 2 chunks.Time to clean it up to avoid later confusion.
Quoted 7 lines
Fixes 8bcd3dd41766 ("drm/i915/cnl: Add power wells for CNL")Cc Clint Taylor <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Imre Deak <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Looks ok and also the correct thing for CNL_H/S, where the port E DDI power well is separate from port A and not dependent on power well #2 (unlike SKL):
Reviewed-by Imre Deak <[email protected]>Quoted 25 lines
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/intel_runtime_pm.c +0
-3@@ -1796,7 +1796,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,BIT_ULL (POWER_DOMAIN_PORT_DDI_B_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_C_LANES ) | \BIT_ULL (POWER_DOMAIN_PORT_DDI_D_LANES ) | \ -BIT_ULL (POWER_DOMAIN_PORT_DDI_E_LANES ) | \BIT_ULL (POWER_DOMAIN_AUX_B ) | \BIT_ULL (POWER_DOMAIN_AUX_C ) | \ BIT_ULL(POWER_DOMAIN_AUX_D) | \@@ -1805,7 +1804,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO) | \ BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DDI_B_IO_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO) | \ --Quoted 2 lines
2.13.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx