drm/i915/cnl: Add missing type case.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/cnl: Add missing type case.
Paulo had noticed that inside cnl_ddi_vswing_program the case was handling voltage but with no indication of type where a missing type could also take us to that path. So my first attempt was to add a message to let clear who trigger that path.
However DK had a better idea that is to handle the missed type sooner before it might take to that path. So this v2 here uses his approach.
v2: Handle missed type sooner.
--- drivers/gpu/drm/i915/intel_ddi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +4 -1
@@ -1979,9 +1979,12 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder, u32 level)if ((intel_dp) && (type ==INTEL_OUTPUT_EDP || type ==INTEL_OUTPUT_DP )) { width = intel_dp->lane_count; rate = intel_dp->link_rate; - }else { + }else if (type ==INTEL_OUTPUT_HDMI ) { width =4 ;/* Rate is always < than 6GHz for HDMI */ + }else { +MISSING_CASE (type); +return ; }/*
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: success for drm/i915/cnl: Add missing type case.
== Series Details ==
== Series Details ==
Series: drm/i915/cnl: Add missing type case.
URL : https://patchwork.freedesktop.org/series/27080/
State : success
== Summary ==
Series 27080v1 drm/i915/cnl: Add missing type case.
https://patchwork.freedesktop.org/api/1.0/series/27080/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125 +1fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:442s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:430s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:359s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:528s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:506s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:489s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:484s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:596s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:437s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:415s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:421s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:499s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:464s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:575s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:579s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:571s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:462s fi-skl-6700hq total:279 pass:262 dwarn:0 dfail:0 fail:0 skip:17 time:590s fi-skl-6700k total:279 pass:257 dwarn:4 dfail:0 fail:0 skip:18 time:467s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:476s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:436s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:504s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:558s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:405s
22f607fdf9632272d3c1938d89c76c7488bc7125 drm-tip: 2017y-07m-10d-20h-48m-19s UTC integration manifest ac71674 drm/i915/cnl: Add missing type case.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5159/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · PDT Rodrigo Vivi
Paulo had noticed that inside
cnl_ddi_vswing_programthe case was handling voltage but with no indication of type where a missing type could also take us to that path. So my first attempt was to add a message to let clear who trigger that path.However DK had a better idea that is to handle the missed type sooner before it might take to that path. So this v2 here uses his approach.
v2: Handle missed type sooner.
Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_ddi.cindex241decf2a7d9..efb13582dc73100644drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1979,9 +1979,12 @@ static void cnl_ddi_vswing_sequence(struct
intel_encoder*encoder, u32 level) if ((intel_dp) && (type ==INTEL_OUTPUT_EDP|| type ==INTEL_OUTPUT_DP)) { width =intel_dp->lane_count;drivers/gpu/drm/i915/intel_ddi.c +0
-0rate = intel_dp->link_rate;
drivers/gpu/drm/i915/intel_ddi.c static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder, u32 level) · line 1990
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +4
-1- }else { + }else if (type ==INTEL_OUTPUT_HDMI ) { width =4 ;/* Rate is always < than 6GHz for HDMI */ + }else { +MISSING_CASE (type); +return ; }/*
The early return in this version avoids register writes for invalid encoder types. So,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines · Dhinakaran Pandiyan
Quoted 37 lines · PDT Rodrigo Vivi
Paulo had noticed that inside
cnl_ddi_vswing_programthe case was handling voltage but with no indication of type where a missing type could also take us to that path. So my first attempt was to add a message to let clear who trigger that path.However DK had a better idea that is to handle the missed type sooner before it might take to that path. So this v2 here uses his approach.
v2: Handle missed type sooner.
Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_ddi.cindex241decf2a7d9..efb13582dc73100644drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1979,9 +1979,12 @@ static void cnl_ddi_vswing_sequence(struct
intel_encoder*encoder, u32 level) if ((intel_dp) && (type ==INTEL_OUTPUT_EDP|| type ==INTEL_OUTPUT_DP)) { width =intel_dp->lane_count;drivers/gpu/drm/i915/intel_ddi.c +4
-1rate = intel_dp->link_rate; - }else { + }else if (type ==INTEL_OUTPUT_HDMI ) { width =4 ;/* Rate is always < than 6GHz for HDMI */ + }else { +MISSING_CASE (type); +return ; }
Quoted 5 lines
Quoted 1 line
/*
The early return in this version avoids register writes for invalid encoder types. So,
Reviewed-by Dhinakaran Pandiyan <[email protected]>
merged to dinq, thanks for the suggestion and review!
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx