aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-18 15:10:43 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-18 15:12:39 -0400
commit75e539864a133c4d8d6a4aac9f409e0a23d7bc3f (patch)
tree85e2c73b0c31a9d2e668601af43c570956461d98 /drivers/gpu/drm/i915/intel_display.c
parent0a073b843bcd9a660f76e497182aac97cafddc4c (diff)
drm/i915: fix VLV limits
Magic updates. v2: use 64 bit types and math (Ville) v3: Trim out all the m/n/p calculation changes since they are still under discussion. Instead squash in a fixup for hdmi limits which slipped into a different patch. Signed-off-by: Pallavi G <pallavi.g@intel.com> Signed-off-by: Vijay Purushothaman <vijay.a.purushothaman@intel.com> Signed-off-by: Yogesh M <yogesh.mohan.marimuthu@intel.com> Signed-off-by: Gajanan Bhat <gajanan.bhat@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> (v2) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 02faba0263de..bdbad762134c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -396,15 +396,15 @@ static const intel_limit_t intel_limits_vlv_dac = {
396 .m1 = { .min = 2, .max = 3 }, 396 .m1 = { .min = 2, .max = 3 },
397 .m2 = { .min = 11, .max = 156 }, 397 .m2 = { .min = 11, .max = 156 },
398 .p = { .min = 10, .max = 30 }, 398 .p = { .min = 10, .max = 30 },
399 .p1 = { .min = 2, .max = 3 }, 399 .p1 = { .min = 1, .max = 3 },
400 .p2 = { .dot_limit = 270000, 400 .p2 = { .dot_limit = 270000,
401 .p2_slow = 2, .p2_fast = 20 }, 401 .p2_slow = 2, .p2_fast = 20 },
402 .find_pll = intel_vlv_find_best_pll, 402 .find_pll = intel_vlv_find_best_pll,
403}; 403};
404 404
405static const intel_limit_t intel_limits_vlv_hdmi = { 405static const intel_limit_t intel_limits_vlv_hdmi = {
406 .dot = { .min = 20000, .max = 165000 }, 406 .dot = { .min = 25000, .max = 270000 },
407 .vco = { .min = 4000000, .max = 5994000}, 407 .vco = { .min = 4000000, .max = 6000000 },
408 .n = { .min = 1, .max = 7 }, 408 .n = { .min = 1, .max = 7 },
409 .m = { .min = 60, .max = 300 }, /* guess */ 409 .m = { .min = 60, .max = 300 }, /* guess */
410 .m1 = { .min = 2, .max = 3 }, 410 .m1 = { .min = 2, .max = 3 },
@@ -424,7 +424,7 @@ static const intel_limit_t intel_limits_vlv_dp = {
424 .m1 = { .min = 2, .max = 3 }, 424 .m1 = { .min = 2, .max = 3 },
425 .m2 = { .min = 11, .max = 156 }, 425 .m2 = { .min = 11, .max = 156 },
426 .p = { .min = 10, .max = 30 }, 426 .p = { .min = 10, .max = 30 },
427 .p1 = { .min = 2, .max = 3 }, 427 .p1 = { .min = 1, .max = 3 },
428 .p2 = { .dot_limit = 270000, 428 .p2 = { .dot_limit = 270000,
429 .p2_slow = 2, .p2_fast = 20 }, 429 .p2_slow = 2, .p2_fast = 20 },
430 .find_pll = intel_vlv_find_best_pll, 430 .find_pll = intel_vlv_find_best_pll,