Revert "drm/i915: Move Valleyview DP DPLL divisor calc to intel_dp_set_clock v2"
Subsystems (2)
PATCH 1/1 Revert "drm/i915: Move Valleyview DP DPLL divisor calc to intel_dp_set_clock v2"
This reverts commit 65ce4bf5a15fcd4d15898be47795d0550eb2325c.
--- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++++--- drivers/gpu/drm/i915/intel_dp.c | 10 +--------- 2 files changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +17 -3
@@ -336,6 +336,19 @@ static const intel_limit_t intel_limits_vlv_hdmi = { .p2_slow = 2, .p2_fast = 20 }, }; +static const intel_limit_t intel_limits_vlv_dp = { + .dot = { .min =25000 , .max =270000 }, + .vco = { .min =4000000 , .max =6000000 }, + .n = { .min =1 , .max =7 }, + .m = { .min =22 , .max =450 }, + .m1 = { .min =2 , .max =3 }, + .m2 = { .min =11 , .max =156 }, + .p = { .min =10 , .max =30 }, + .p1 = { .min =1 , .max =3 }, + .p2 = { .dot_limit =270000 , + .p2_slow =2 , .p2_fast =20 }, +}; +static const intel_limit_t *intel_ironlake_limit (struct drm_crtc *crtc,int refclk) {
@@ -398,8 +411,10 @@ static const intel_limit_t *intel_limit(struct drm_crtc *crtc, int refclk) }else if (IS_VALLEYVIEW (dev)) {if (intel_pipe_has_type (crtc,INTEL_OUTPUT_ANALOG )) limit = &intel_limits_vlv_dac; -else +else if (intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) limit = &intel_limits_vlv_hdmi; +else + limit = &intel_limits_vlv_dp; }else if (!IS_GEN2 (dev)) {if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) limit = &intel_limits_i9xx_lvds;
@@ -4871,7 +4886,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, refclk =i9xx_get_refclk (crtc, num_connectors); -if (!is_dsi && !intel_crtc->config.clock_set) { +if (!is_dsi) {/* * Returns a set of divisors for the desired target clock with * the given refclk, or FALSE. The returned values represent
@@ -4898,7 +4913,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,* by using the FP0/FP1. In such case we will disable the LVDS * downclock feature. */ - limit =intel_limit (crtc, refclk); has_reduced_clock = dev_priv->display.find_dpll(limit, crtc, dev_priv->lvds_downclock,
drivers/gpu/drm/i915/intel_dp.c +1 -9
@@ -57,13 +57,6 @@ static const struct dp_link_dpll pch_dpll[] = { { .p1 = 1, .p2 = 10, .n = 2, .m1 = 14, .m2 = 8 } } }; -static const struct dp_link_dpll vlv_dpll[] = { - {DP_LINK_BW_1_62 , - { .p1 =3 , .p2 =2 , .n =5 , .m1 =5 , .m2 =3 } }, - {DP_LINK_BW_2_7 , - { .p1 =2 , .p2 =2 , .n =1 , .m1 =2 , .m2 =27 } } -}; -/** * is_edp - is the given port attached to an eDP panel (either CPU or PCH) * @intel_dp: DP struct
@@ -736,8 +729,7 @@ intel_dp_set_clock(struct intel_encoder *encoder, divisor = pch_dpll; count =ARRAY_SIZE (pch_dpll); }else if (IS_VALLEYVIEW (dev)) { - divisor = vlv_dpll; - count =ARRAY_SIZE (vlv_dpll); +/* FIXME: Need to figure out optimized DP clocks for vlv. */ }if (divisor && count) {
Signature · 1 line
1.7.9.5
Quoted 1 line · On Fri, 13 Sep 2013 17:27:54 -0700 Jesse Barnes <[email protected]>…
This reverts commit
65ce4bf5a15fcd4d15898be47795d0550eb2325c.
Found this was breaking eDP for me with -nightly as of today on Baley Bay boards.
Chris, can you verify this on your system too? I'm working on getting a new one with eDP support to test more.
Thanks,
Jesse
Quoted 10 lines · Jesse Barnes
Quoted 1 line · On Fri, 13 Sep 2013 17:27:54 -0700 Jesse Barnes <[email protected]>…
This reverts commit
65ce4bf5a15fcd4d15898be47795d0550eb2325c.Found this was breaking eDP for me with -nightly as of today on Baley Bay boards.
Chris, can you verify this on your system too? I'm working on getting a new one with eDP support to test more.
Checking with my calculator the pll settings for the 1.62 clock are wrong. Can you try to just fix them?
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 1/1 drm/i915: Fix VLV eDP timing
In reply to Jesse BarnesFix the typo in previous commit for DP 1.62 divisor.
drm/i915: Move Valleyview DP DPLL divisor calc to intel_dp_set_clock v2
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -59,7 +59,7 @@ static const struct dp_link_dpll pch_dpll[] = {static const struct dp_link_dpll vlv_dpll[] = { {DP_LINK_BW_1_62 , - { .p1 =3 , .p2 =2 , .n =5 , .m1 =5 , .m2 =3 } }, + { .p1 =3 , .p2 =2 , .n =5 , .m1 =5 , .m2 =81 } }, {DP_LINK_BW_2_7 , { .p1 =2 , .p2 =2 , .n =1 , .m1 =2 , .m2 =27 } } };
Signature · 1 line
1.7.7.6
PATCH 1/1 drm/i915: Fix VLV eDP timing v2
Fix the typo in previous commit for DP 1.62 divisor. drm/i915: Move Valleyview DP DPLL divisor calc to intel_dp_set_clock v2
v2: sigh, the m1 div is 3.
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -59,7 +59,7 @@ static const struct dp_link_dpll pch_dpll[] = {static const struct dp_link_dpll vlv_dpll[] = { {DP_LINK_BW_1_62 , - { .p1 =3 , .p2 =2 , .n =5 , .m1 =5 , .m2 =3 } }, + { .p1 =3 , .p2 =2 , .n =5 , .m1 =3 , .m2 =81 } }, {DP_LINK_BW_2_7 , { .p1 =2 , .p2 =2 , .n =1 , .m1 =2 , .m2 =27 } } };
Signature · 1 line
1.7.7.6
Re: [PATCH] drm/i915: Fix VLV eDP timing v2
Quoted 7 lines · Chon Ming Lee
Fix the typo in previous commit for DP 1.62 divisor. drm/i915: Move Valleyview DP DPLL divisor calc to
intel_dp_set_clockv2v2: sigh, the m1 div is 3.
Reported-by Jesse Barnes <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>
Ok, I'll try this one ...
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Daniel Vetter
AppliedRe: [PATCH] drm/i915: Fix VLV eDP timing
In reply to Chon Ming LeeQuoted 6 lines · Chon Ming Lee
Fix the typo in previous commit for DP 1.62 divisor.
drm/i915: Move Valleyview DP DPLL divisor calc to
intel_dp_set_clockv2Reported-by Jesse Barnes <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>
Ville just submitted the same patch so I guess this is right ;-)
Merged to dinq, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch