drm/i915: Sink rate read should be saved in deca-kHz
Subsystems (2)
PATCH 1/3 drm/i915: Sink rate read should be saved in deca-kHz
The sink rate read from supported link rate table is in KHz as per spec while in drm, the saved clock is in deca-KHz. So divide the link rate by 10 before storing.
---
Just resending it along with the other intermediate link rate patches (It was posted orginally on 21st April)
Thanks,
Sonika
drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -3906,7 +3906,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)if (val ==0 )break ; - intel_dp->sink_rates[i] = val *200 ; +/* Value read is in kHz while drm clock is saved in deca-kHz */ + intel_dp->sink_rates[i] = (val *200 ) /10 ; } intel_dp->num_sink_rates = i; }
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Rename dp rates array as per platform
Renaming gen9_rates to skl_rates because other platforms may have different supported rates.
--- drivers/gpu/drm/i915/intel_dp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +5 -5
@@ -84,8 +84,8 @@ static const struct dp_link_dpll chv_dpll[] = { {DP_LINK_BW_5_4 ,/* m2_int = 27, m2_fraction = 0 */ { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; -/* Skylake supports following rates */ -static const int gen9_rates[] = {162000 ,216000 ,270000 , + +static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,243000 ,270000 ,324000 ,405000 ,
@@ -1161,9 +1161,9 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (INTEL_INFO (dev)->gen >=9 ) { - *source_rates = gen9_rates; -return ARRAY_SIZE (gen9_rates); +if (IS_SKYLAKE (dev)) { + *source_rates = skl_rates; +return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) { *source_rates = chv_rates;return ARRAY_SIZE (chv_rates);
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Rename dp rates array as per platform
Quoted 4 lines · Sonika Jindal
Renaming
gen9_ratestoskl_ratesbecause other platforms may have different supported rates.Signed-off-by Sonika Jindal <[email protected]>
Quoted 39 lines
--- drivers/gpu/drm/i915/intel_dp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dp.c +5
-5@@ -84,8 +84,8 @@ static const struct dp_link_dpll chv_dpll[] = { {DP_LINK_BW_5_4 ,/* m2_int = 27, m2_fraction = 0 */ { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; -/* Skylake supports following rates */ -static const int gen9_rates[] = {162000 ,216000 ,270000 , + +static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,243000 ,270000 ,324000 ,405000 ,@@ -1161,9 +1161,9 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (INTEL_INFO (dev)->gen >=9 ) { - *source_rates = gen9_rates; -return ARRAY_SIZE (gen9_rates); +if (IS_SKYLAKE (dev)) { + *source_rates = skl_rates; +return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) { *source_rates = chv_rates;return ARRAY_SIZE (chv_rates);Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 2/3] drm/i915: Rename dp rates array as per platform
Quoted 7 lines · Ville Syrjälä
Quoted 4 lines · Sonika Jindal
Renaming
gen9_ratestoskl_ratesbecause other platforms may have different supported rates.Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalBXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
--- drivers/gpu/drm/i915/intel_ddi.c | 44 ++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dp.c | 7 +++++- 2 files changed, 48 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +42 -2
@@ -1397,8 +1397,7 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x04 ; else clk_div.lanestagger = 0x02; - }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || - intel_encoder->type ==INTEL_OUTPUT_EDP ) { + }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT ) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
@@ -1416,8 +1415,49 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div = bxt_dp_clk_val[0 ];DRM_ERROR ("Unknown link rate\n" ); } + }else if (intel_encoder->type ==INTEL_OUTPUT_EDP ) { +struct drm_encoder *encoder = &intel_encoder->base; +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int link_rate; + +/* +* If edp1.4 intermediate frequency support is present, we set +* link_bw to 0 and a valid rate index in rate_select. +*/ +if (intel_dp->link_bw) + link_rate =drm_dp_bw_code_to_link_rate (intel_dp->link_bw); +else + link_rate = intel_dp->sink_rates[intel_dp->rate_select]; + +switch (link_rate) { +case 162000 : + clk_div = bxt_dp_clk_val[0 ]; +break ; +case 216000 : + clk_div = bxt_dp_clk_val[3 ]; +break ; +case 243000 : + clk_div = bxt_dp_clk_val[4 ]; +break ; +case 270000 : + clk_div = bxt_dp_clk_val[1 ]; +break ; +case 324000 : + clk_div = bxt_dp_clk_val[5 ]; +break ; +case 432000 : + clk_div = bxt_dp_clk_val[6 ]; +break ; +case 540000 : + clk_div = bxt_dp_clk_val[2 ]; +break ; +default : + clk_div = bxt_dp_clk_val[0 ]; +DRM_ERROR ("Unknown link rate\n" ); + } } + crtc_state->dpll_hw_state.ebb0 =PORT_PLL_P1 (clk_div.p1) |PORT_PLL_P2 (clk_div.p2); crtc_state->dpll_hw_state.pll0 = clk_div.m2_int;
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 31 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 44 ++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dp.c | 7 +++++- 2 files changed, 48 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-2@@ -1397,8 +1397,7 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x04 ; else clk_div.lanestagger = 0x02; - }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || - intel_encoder->type ==INTEL_OUTPUT_EDP ) { + }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT ) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);@@ -1416,8 +1415,49 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div = bxt_dp_clk_val[0 ];DRM_ERROR ("Unknown link rate\n" ); } + }else if (intel_encoder->type ==INTEL_OUTPUT_EDP ) { +struct drm_encoder *encoder = &intel_encoder->base; +struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1430
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10
-0+int link_rate; + +/* +* If edp1.4 intermediate frequency support is present, we set +* link_bw to 0 and a valid rate index in rate_select. +*/ +if (intel_dp->link_bw) + link_rate =drm_dp_bw_code_to_link_rate (intel_dp->link_bw); +else + link_rate = intel_dp->sink_rates[intel_dp->rate_select];
The chosen clock should already be passed in, so no there should be no need for this. I see the DP case does has the same issue.
Quoted 17 lines
drivers/gpu/drm/i915/intel_ddi.c +17
-0+ +switch (link_rate) { +case 162000 : + clk_div = bxt_dp_clk_val[0 ]; +break ; +case 216000 : + clk_div = bxt_dp_clk_val[3 ]; +break ; +case 243000 : + clk_div = bxt_dp_clk_val[4 ]; +break ; +case 270000 : + clk_div = bxt_dp_clk_val[1 ]; +break ; +case 324000 : + clk_div = bxt_dp_clk_val[5 ]; +break ;
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1457
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10
-0+case 432000 : + clk_div = bxt_dp_clk_val[6 ]; +break ; +case 540000 : + clk_div = bxt_dp_clk_val[2 ]; +break ; +default : + clk_div = bxt_dp_clk_val[0 ]; +DRM_ERROR ("Unknown link rate\n" ); + }
This looks rather fragile. I would suggest storing the link rate in the bxt_clk_div structure and just looping through the array looking for the correct rate. That will also work for normal DP, so less code in the end.
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1460
Quoted 3 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0} +
Spurious whitespace.
Quoted 35 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0crtc_state->dpll_hw_state.ebb0 =PORT_PLL_P1 (clk_div.p1) |PORT_PLL_P2 (clk_div.p2); crtc_state->dpll_hw_state.pll0 = clk_div.m2_int;drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 37 lines · Ville Syrjälä
Quoted 36 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 44 ++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dp.c | 7 +++++- 2 files changed, 48 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +9
-2@@ -1397,8 +1397,7 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x04 ; else clk_div.lanestagger = 0x02; - }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || - intel_encoder->type ==INTEL_OUTPUT_EDP ) { + }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT ) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);@@ -1416,8 +1415,49 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div = bxt_dp_clk_val[0 ];DRM_ERROR ("Unknown link rate\n" ); } + }else if (intel_encoder->type ==INTEL_OUTPUT_EDP ) { +struct drm_encoder *encoder = &intel_encoder->base; +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int link_rate; + +/* +* If edp1.4 intermediate frequency support is present, we set +* link_bw to 0 and a valid rate index in rate_select.
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1430
Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +5
-0+*/ +if (intel_dp->link_bw) + link_rate =drm_dp_bw_code_to_link_rate (intel_dp->link_bw); +else + link_rate = intel_dp->sink_rates[intel_dp->rate_select];The chosen clock should already be passed in, so no there should be no need for this. I see the DP case does has the same issue.
Yes it was copied from DP :)
Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/intel_ddi.c +24
-0+ +switch (link_rate) { +case 162000 : + clk_div = bxt_dp_clk_val[0 ]; +break ; +case 216000 : + clk_div = bxt_dp_clk_val[3 ]; +break ; +case 243000 : + clk_div = bxt_dp_clk_val[4 ]; +break ; +case 270000 : + clk_div = bxt_dp_clk_val[1 ]; +break ; +case 324000 : + clk_div = bxt_dp_clk_val[5 ]; +break ; +case 432000 : + clk_div = bxt_dp_clk_val[6 ]; +break ; +case 540000 : + clk_div = bxt_dp_clk_val[2 ]; +break ; +default :
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1457
Quoted 3 lines
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ clk_div = bxt_dp_clk_val[0 ]; +DRM_ERROR ("Unknown link rate\n" ); + }This looks rather fragile. I would suggest storing the link rate in the
bxt_clk_divstructure and just looping through the array looking for the correct rate. That will also work for normal DP, so less code in the end.
Ok, I will do that.
Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1460
Quoted 4 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0} +Spurious whitespace.
:(
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0crtc_state->dpll_hw_state.ebb0 =PORT_PLL_P1 (clk_div.p1) |PORT_PLL_P2 (clk_div.p2); crtc_state->dpll_hw_state.pll0 = clk_div.m2_int;drivers/gpu/drm/i915/intel_dp.c +6
-2@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) { --1.7.10.4
Quoted 5 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/bxt: edp1.4 Intermediate Freq support
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
v2: Adding clock in bxt_clk_div struct and then look for the entry with required rate (Ville)
--- drivers/gpu/drm/i915/intel_ddi.c | 45 +++++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp.c | 7 +++++- 2 files changed, 31 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +25 -20
@@ -1327,6 +1327,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
@@ -1342,13 +1343,13 @@ struct bxt_clk_div {/* pre-calculated values for DP linkrates */ static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool
@@ -1401,20 +1402,24 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, intel_encoder->type == INTEL_OUTPUT_EDP) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int link_rate; +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); +/* +* If edp1.4 intermediate frequency support is present, we set +* link_bw to 0 and a valid rate index in rate_select. +*/ +if (intel_dp->link_bw) + link_rate = clock; +else + link_rate = intel_dp->sink_rates[intel_dp->rate_select]; + + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <7 ; ++i) { +if (bxt_dp_clk_val[i].clock == link_rate) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } }
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 64 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 45 +++++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp.c | 7 +++++- 2 files changed, 31 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +10
-18@@ -1327,6 +1327,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1342,13 +1343,13 @@ struct bxt_clk_div {/* pre-calculated values for DP linkrates */ static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool@@ -1401,20 +1402,24 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, intel_encoder->type == INTEL_OUTPUT_EDP) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int link_rate; +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default :
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1415
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +8
-2- clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); +/* +* If edp1.4 intermediate frequency support is present, we set +* link_bw to 0 and a valid rate index in rate_select. +*/ +if (intel_dp->link_bw) + link_rate = clock; +else + link_rate = intel_dp->sink_rates[intel_dp->rate_select];
'clock' should be correct in either case.
Quoted 37 lines
drivers/gpu/drm/i915/intel_ddi.c +7
-0+ + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <7 ; ++i) { +if (bxt_dp_clk_val[i].clock == link_rate) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } }drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 1 line
1.7.10.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/bxt: edp1.4 Intermediate Freq support
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
v2: Adding clock in bxt_clk_div struct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to use link_bw or rate_select for selecting pll(Ville)
--- drivers/gpu/drm/i915/intel_ddi.c | 37 +++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 21 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +15 -22
@@ -1327,6 +1327,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
@@ -1342,13 +1343,13 @@ struct bxt_clk_div {/* pre-calculated values for DP linkrates */ static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool
@@ -1399,22 +1400,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x02 ; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <7 ; ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } }
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 28 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 37 +++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 21 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -1327,6 +1327,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
drivers/gpu/drm/i915/intel_ddi.c struct bxt_clk_div { · line 1345
Quoted 3 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1342,13 +1343,13 @@ struct bxt_clk_div {/* pre-calculated values for DP linkrates */ static struct bxt_clk_div bxt_dp_clk_val[7 ] = {
Just noticed someone forgot to make this array const. Please do that too. Also no need to specify an explict size for it.
Quoted 30 lines
drivers/gpu/drm/i915/intel_ddi.c +8
-14- /* 162 */ {4, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, - /* 270 */ {4, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0xd}, - /* 540 */ {2, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0x18}, - /* 216 */ {3, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, - /* 243 */ {4, 1, 24, 1258291, 1, 1, 5, 11, 2, 9, 0xd}, - /* 324 */ {4, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, - /* 432 */ {3, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0x18} + {162000, 4, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, + {270000, 4, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0xd}, + {540000, 2, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0x18}, + {216000, 3, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, + {243000, 4, 1, 24, 1258291, 1, 1, 5, 11, 2, 9, 0xd}, + {324000, 4, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd}, + {432000, 3, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0x18} }; static bool@@ -1399,22 +1400,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x02 ; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 :
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1406
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-8- clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <7 ; ++i) {
ARRAY_SIZE()
With that stuff changed this is
Quoted 34 lines
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } }drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 1 line
1.7.10.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/bxt: edp1.4 Intermediate Freq support
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
v2: Adding clock in bxt_clk_div struct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to use link_bw or rate_select for selecting pll(Ville)
v4: Make bxt_dp_clk_val const and remove size (Ville)
--- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +16 -23
@@ -1327,6 +1327,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
@@ -1341,14 +1342,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool
@@ -1399,22 +1400,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, clk_div.lanestagger =0x02 ; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } }
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -85,6 +85,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1161,7 +1163,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 4 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
Quoted 8 lines
v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalTask id: 6379 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -3 272/272 269/272
ILK 302/302 302/302
SNB -1 315/315 314/315
IVB 343/343 343/343 BYT 287/287 287/287 BDW 317/317 317/317 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt@gem_tiled_pread_pwrite PASS(2) FAIL(1) *PNV igt@gem_userptr_blits@coherency-sync PASS(2) CRASH(1) *PNV igt@gem_userptr_blits@coherency-unsync PASS(2) CRASH(1) SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(7)PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Ville SyrjäläBXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
v2: Adding clock in bxt_clk_div struct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to use link_bw or rate_select for selecting pll(Ville)
v4: Make bxt_dp_clk_val const and remove size (Ville)
v5: Rebased
--- drivers/gpu/drm/i915/intel_ddi.c | 40 +++++++++++++++----------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +16 -24
@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool
@@ -1390,24 +1391,15 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } - vco = clock *10 /2 * clk_div.p1 * clk_div.p2; } dco_amp =15 ;
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 11 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: Rebased
Quoted 2 lines
Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
This time applied for really. Somehow the previous attempt fell short, and digging into git reflog didn't reveal any clues. Sorry for the mess I've made.
-Daniel
Quoted 104 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 40 +++++++++++++++----------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +16
-24@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool@@ -1390,24 +1391,15 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } - vco = clock *10 /2 * clk_div.p1 * clk_div.p2; } dco_amp =15 ;drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 12 lines · Daniel Vetter
Quoted 11 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: Rebased
Quoted 6 lines
Quoted 2 lines
Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>This time applied for really. Somehow the previous attempt fell short, and digging into git reflog didn't reveal any clues. Sorry for the mess I've made.
Please drop this, the rebase does not take into account
commit b6dc71f38a84e36c5445b95f9f7a2dac6b25636f
Author: Vandana Kannan <[email protected]> Date: Wed May 13 12:18:52 2015 +0530
drm/i915/bxt: Port PLL programming BUN
and now leaves vco at zero.
BR,
Jani.
Quoted 115 lines
-Daniel
Quoted 104 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 40 +++++++++++++++----------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +16
-24@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool@@ -1390,24 +1391,15 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } - vco = clock *10 /2 * clk_div.p1 * clk_div.p2; } dco_amp =15 ;drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 22 lines · Jani Nikula
Quoted 12 lines · Daniel Vetter
Quoted 11 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: RebasedQuoted 6 lines
Quoted 2 lines
Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>This time applied for really. Somehow the previous attempt fell short, and digging into git reflog didn't reveal any clues. Sorry for the mess I've made.
Please drop this, the rebase does not take into account
Quoted 7 lines
commit
b6dc71f38a84e36c5445b95f9f7a2dac6b25636fAuthor: Vandana Kannan <[email protected]> Date: Wed May 13 12:18:52 2015 +0530drm/i915/bxt: Port PLL programming BUN
and now leaves vco at zero.
Yeah dropped again. I didn't do the rebase myself because of these functional conflicts, but then totally forgot to check that Sonika bothered to run the patch first.
Generally when I ask for a rebase it means that there's something nontrivial going on ...
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 29 lines · Daniel Vetter
Quoted 28 lines · Jani Nikula
Quoted 12 lines · Daniel Vetter
Quoted 11 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: RebasedQuoted 6 lines
Quoted 2 lines
Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>This time applied for really. Somehow the previous attempt fell short, and digging into git reflog didn't reveal any clues. Sorry for the mess I've made.
Please drop this, the rebase does not take into account
commit
b6dc71f38a84e36c5445b95f9f7a2dac6b25636fAuthor: Vandana Kannan <[email protected]> Date: Wed May 13 12:18:52 2015 +0530drm/i915/bxt: Port PLL programming BUN
Quoted 9 lines
Quoted 1 line
and now leaves vco at zero.
Yeah dropped again. I didn't do the rebase myself because of these functional conflicts, but then totally forgot to check that Sonika bothered to run the patch first.
Generally when I ask for a rebase it means that there's something nontrivial going on ...
:( Completely my mistake. Removed that line by mistake :(
Quoted 2 lines
Thanks, Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/bxt: edp1.4 Intermediate Freq support
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.
v2: Adding clock in bxt_clk_div struct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to use link_bw or rate_select for selecting pll(Ville)
v4: Make bxt_dp_clk_val const and remove size (Ville)
v5: Rebased
v6: Removed setting of vco while rebasing in v5, adding it back
--- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +16 -23
@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;
@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 } }; static bool
@@ -1390,22 +1391,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } vco = clock *10 /2 * clk_div.p1 * clk_div.p2; }
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,
@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Hi Vandana,
Can you please review the v6 of this patch?
This was rebased recently on top of your patch:
commit b6dc71f38a84e36c5445b95f9f7a2dac6b25636f
Author: Vandana Kannan <[email protected]>
Date: Wed May 13 12:18:52 2015 +0530
drm/i915/bxt: Port PLL programming BUN
Thanks,
Sonika
Quoted 100 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: Rebased
v6: Removed setting of vco while rebasing in v5, adding it backSigned-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>(v4)--- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +16
-23@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 } }; static bool@@ -1390,22 +1391,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } vco = clock *10 /2 * clk_div.p1 * clk_div.p2; }drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) static int
drivers/gpu/drm/i915/intel_dp.c intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) · line 1181
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4
-1intel_dp_source_rates(struct drm_device *dev, const int **source_rates) { - if (IS_SKYLAKE(dev)) { + if (IS_BROXTON(dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + } else if (IS_SKYLAKE(dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); } else if (IS_CHERRYVIEW(dev)) {
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalQuoted 100 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: Rebased
v6: Removed setting of vco while rebasing in v5, adding it backSigned-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>(v4)--- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +16
-23@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 } }; static bool@@ -1390,22 +1391,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } vco = clock *10 /2 * clk_div.p1 * clk_div.p2; }drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) static int
drivers/gpu/drm/i915/intel_dp.c intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) · line 1181
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4
-1intel_dp_source_rates(struct drm_device *dev, const int **source_rates) { - if (IS_SKYLAKE(dev)) { + if (IS_BROXTON(dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + } else if (IS_SKYLAKE(dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); } else if (IS_CHERRYVIEW(dev)) {
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
Quoted 13 lines · Vandana
Quoted 12 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: Rebased
v6: Removed setting of vco while rebasing in v5, adding it back
Quoted 2 lines
Quoted 2 lines
Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>(v4)
Pushed to drm-intel-next-queued, thanks for the patch and review.
BR,
Jani.
Quoted 101 lines
Quoted 86 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++---------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +16
-23@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 } }; static bool@@ -1390,22 +1391,14 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default : - clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } vco = clock *10 /2 * clk_div.p1 * clk_div.p2; }drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) static intdrivers/gpu/drm/i915/intel_dp.c intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) · line 1181
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4
-1intel_dp_source_rates(struct drm_device *dev, const int **source_rates) { - if (IS_SKYLAKE(dev)) { + if (IS_BROXTON(dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + } else if (IS_SKYLAKE(dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); } else if (IS_CHERRYVIEW(dev)) {Reviewed-by Vandana Kannan <[email protected]>_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalQuoted 72 lines · Sonika Jindal
BXT supports following intermediate link rates for edp:
2.16GHz, 2.43GHz, 3.24GHz, 4.32GHz.
Adding support for programming the intermediate rates.v2: Adding clock in
bxt_clk_divstruct and then look for the entry with required rate (Ville)
v3: 'clock' has the selected value, no need to uselink_bworrate_selectfor selecting pll(Ville)
v4: Makebxt_dp_clk_valconst and remove size (Ville)
v5: RebasedSigned-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 40 +++++++++++++++----------------------- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 2 files changed, 22 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +10
-21@@ -1334,6 +1334,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,/* bxt clock parameters */ struct bxt_clk_div { +int clock;uint32_t p1;uint32_t p2;uint32_t m2_int;@@ -1343,14 +1344,14 @@ struct bxt_clk_div { };/* pre-calculated values for DP linkrates */ -static struct bxt_clk_div bxt_dp_clk_val[7 ] = { -/* 162 */ {4 ,2 ,32 ,1677722 ,1 ,1 }, -/* 270 */ {4 ,1 ,27 ,0 ,0 ,1 }, -/* 540 */ {2 ,1 ,27 ,0 ,0 ,1 }, -/* 216 */ {3 ,2 ,32 ,1677722 ,1 ,1 }, -/* 243 */ {4 ,1 ,24 ,1258291 ,1 ,1 }, -/* 324 */ {4 ,1 ,32 ,1677722 ,1 ,1 }, -/* 432 */ {3 ,1 ,32 ,1677722 ,1 ,1 } +static const struct bxt_clk_div bxt_dp_clk_val[] = { + {162000 ,4 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {270000 ,4 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0xd }, + {540000 ,2 ,1 ,27 ,0 ,0 ,1 ,3 ,8 ,1 ,9 ,0x18 }, + {216000 ,3 ,2 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {243000 ,4 ,1 ,24 ,1258291 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {324000 ,4 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0xd }, + {432000 ,3 ,1 ,32 ,1677722 ,1 ,1 ,5 ,11 ,2 ,9 ,0x18 } }; static bool@@ -1390,24 +1391,15 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc, vco = best_clock.vco; }else if (intel_encoder->type ==INTEL_OUTPUT_DISPLAYPORT || intel_encoder->type ==INTEL_OUTPUT_EDP ) { -struct drm_encoder *encoder = &intel_encoder->base; -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +int i; -switch (intel_dp->link_bw) { -case DP_LINK_BW_1_62 : - clk_div = bxt_dp_clk_val[0 ]; -break ; -case DP_LINK_BW_2_7 : - clk_div = bxt_dp_clk_val[1 ]; -break ; -case DP_LINK_BW_5_4 : - clk_div = bxt_dp_clk_val[2 ]; -break ; -default :
drivers/gpu/drm/i915/intel_ddi.c bxt_ddi_pll_select(struct intel_crtc *intel_crtc, · line 1410
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +6
-3- clk_div = bxt_dp_clk_val[0 ]; -DRM_ERROR ("Unknown link rate\n" ); + clk_div = bxt_dp_clk_val[0 ]; +for (i =0 ; i <ARRAY_SIZE (bxt_dp_clk_val); ++i) { +if (bxt_dp_clk_val[i].clock == clock) { + clk_div = bxt_dp_clk_val[i]; +break ; + } } - vco = clock *10 /2 * clk_div.p1 * clk_div.p2;
Without vco set, won't this hit the DRM_ERROR("Invalid VCO\n"); path right below?
BR,
Jani.
Quoted 35 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0} dco_amp =15 ;drivers/gpu/drm/i915/intel_dp.c +6
-1@@ -91,6 +91,8 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } } }; +static const int bxt_rates[] = {162000 ,216000 ,243000 ,270000 , +324000 ,432000 ,540000 };static const int skl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 };static const int chv_rates[] = {162000 ,202500 ,210000 ,216000 ,@@ -1170,7 +1172,10 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)static int intel_dp_source_rates (struct drm_device *dev,const int **source_rates) { -if (IS_SKYLAKE (dev)) { +if (IS_BROXTON (dev)) { + *source_rates = bxt_rates; +return ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev)) { *source_rates = skl_rates;return ARRAY_SIZE (skl_rates); }else if (IS_CHERRYVIEW (dev)) {Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalTask id: 6354 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 342/342 342/342 BYT 286/286 286/286 BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalTask id: 6344 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 342/342 342/342 BYT 286/286 286/286 BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/bxt: edp1.4 Intermediate Freq support
In reply to Sonika JindalTask id: 6338 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 342/342 342/342 BYT 286/286 286/286 BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 3 lines · Sonika Jindal
The sink rate read from supported link rate table is in KHz as per spec while in drm, the saved clock is in deca-KHz. So divide the link rate by 10 before storing.
Please refer to the commit which broke things. git blame is your friend. We need the information to know which kernel version the bug has landed or is about to land to, so we can queue the fix in the same place.
If developers don't do this, maintainers will have to anyway, which doesn't scale well, which leads to grumpy maintainers. ;)
Thanks,
Jani.
Quoted 34 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>---
Just resending it along with the other intermediate link rate patches (It was posted orginally on 21st April)Thanks,
Sonikadrivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +2
-1@@ -3906,7 +3906,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)if (val ==0 )break ; - intel_dp->sink_rates[i] = val *200 ; +/* Value read is in kHz while drm clock is saved in deca-kHz */ + intel_dp->sink_rates[i] = (val *200 ) /10 ; } intel_dp->num_sink_rates = i; }Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä
Reviewed-byQuoted 5 lines · Jani Nikula
Quoted 3 lines · Sonika Jindal
The sink rate read from supported link rate table is in KHz as per spec while in drm, the saved clock is in deca-KHz. So divide the link rate by 10 before storing.
Quoted 7 lines
Please refer to the commit which broke things. git blame is your friend. We need the information to know which kernel version the bug has landed or is about to land to, so we can queue the fix in the same place.
If developers don't do this, maintainers will have to anyway, which doesn't scale well, which leads to grumpy maintainers. ;)
Indeed, now I wonder if I broke it during the refactoring or was it already like that before that. Hmm. Doesn't look like it was me, but I did fail to spot it during the review :(
Anyway, with the commit msg amended to Jani's liking this is:
Quoted 46 lines
Thanks,
Jani.Quoted 34 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>---
Just resending it along with the other intermediate link rate patches (It was posted orginally on 21st April)Thanks,
Sonikadrivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +2
-1@@ -3906,7 +3906,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)if (val ==0 )break ; - intel_dp->sink_rates[i] = val *200 ; +/* Value read is in kHz while drm clock is saved in deca-kHz */ + intel_dp->sink_rates[i] = (val *200 ) /10 ; } intel_dp->num_sink_rates = i; }Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Sink rate read should be saved in deca-kHz
The sink rate read from supported link rate table is in KHz as per spec while in drm, the saved clock is in deca-KHz. So divide the link rate by 10 before storing.
Reading of rates was added by:
commit fc0f8e25318f ("drm/i915/skl: Read sink supported rates from edp panel")
--- drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -3906,7 +3906,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)if (val ==0 )break ; - intel_dp->sink_rates[i] = val *200 ; +/* Value read is in kHz while drm clock is saved in deca-kHz */ + intel_dp->sink_rates[i] = (val *200 ) /10 ; } intel_dp->num_sink_rates = i; }
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 7 lines · Sonika Jindal
The sink rate read from supported link rate table is in KHz as per spec while in drm, the saved clock is in deca-KHz. So divide the link rate by 10 before storing.
Reading of rates was added by:
commitfc0f8e25318f("drm/i915/skl: Read sink supported rates from edp panel")
Thanks; now this git spell
$ git tag --contains fc0f8e25318f | grep ^v[0-9] | sort -V | head -n 1 v4.1-rc1
will tell me I need to queue this one to v4.1 through drm-intel-fixes while the rest is for Daniel to merge to drm-intel-next-queued.
Pushed, thanks for the patch and review.
BR,
Jani.
Quoted 29 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +2
-1@@ -3906,7 +3906,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)if (val ==0 )break ; - intel_dp->sink_rates[i] = val *200 ; +/* Value read is in kHz while drm clock is saved in deca-kHz */ + intel_dp->sink_rates[i] = (val *200 ) /10 ; } intel_dp->num_sink_rates = i; }Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx