diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-04-03 15:24:43 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-08 10:18:16 -0700 |
| commit | 6115707be0e85a9b825f10e95143cb705b87fef8 (patch) | |
| tree | 3c83f89743f8298f65b32006f1c6072f00063777 /drivers/gpu | |
| parent | 6911a9b8ae8b2a1dab4dfda9c2bd20f7ca2961d6 (diff) | |
| download | kernel_goldelico_gta04-6115707be0e85a9b825f10e95143cb705b87fef8.zip kernel_goldelico_gta04-6115707be0e85a9b825f10e95143cb705b87fef8.tar.gz kernel_goldelico_gta04-6115707be0e85a9b825f10e95143cb705b87fef8.tar.bz2 | |
drm/i915: Fix a mismerge of the IGD patch (new .find_pll hooks missed)
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 64773ce..c2c8e95 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -367,6 +367,7 @@ static const intel_limit_t intel_limits[] = { .p1 = { .min = I9XX_P1_MIN, .max = I9XX_P1_MAX }, .p2 = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT, .p2_slow = I9XX_P2_SDVO_DAC_SLOW, .p2_fast = I9XX_P2_SDVO_DAC_FAST }, + .find_pll = intel_find_best_PLL, }, { /* INTEL_LIMIT_IGD_LVDS */ .dot = { .min = I9XX_DOT_MIN, .max = I9XX_DOT_MAX }, @@ -380,6 +381,7 @@ static const intel_limit_t intel_limits[] = { /* IGD only supports single-channel mode. */ .p2 = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT, .p2_slow = I9XX_P2_LVDS_SLOW, .p2_fast = I9XX_P2_LVDS_SLOW }, + .find_pll = intel_find_best_PLL, }, }; |