|
@@ -1348,6 +1348,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;
|
|
@@ -1357,14 +1358,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
|
|
@@ -1404,22 +1405,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;
|
|
|
}
|