diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_combios.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index e9ea38ece375..2becdeda68a3 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
| @@ -531,10 +531,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde | |||
| 531 | case CHIP_RS300: | 531 | case CHIP_RS300: |
| 532 | switch (ddc_line) { | 532 | switch (ddc_line) { |
| 533 | case RADEON_GPIO_DVI_DDC: | 533 | case RADEON_GPIO_DVI_DDC: |
| 534 | /* in theory this should be hw capable, | 534 | i2c.hw_capable = true; |
| 535 | * but it doesn't seem to work | ||
| 536 | */ | ||
| 537 | i2c.hw_capable = false; | ||
| 538 | break; | 535 | break; |
| 539 | default: | 536 | default: |
| 540 | i2c.hw_capable = false; | 537 | i2c.hw_capable = false; |
| @@ -633,6 +630,8 @@ bool radeon_combios_get_clock_info(struct drm_device *dev) | |||
| 633 | p1pll->reference_div = RBIOS16(pll_info + 0x10); | 630 | p1pll->reference_div = RBIOS16(pll_info + 0x10); |
| 634 | p1pll->pll_out_min = RBIOS32(pll_info + 0x12); | 631 | p1pll->pll_out_min = RBIOS32(pll_info + 0x12); |
| 635 | p1pll->pll_out_max = RBIOS32(pll_info + 0x16); | 632 | p1pll->pll_out_max = RBIOS32(pll_info + 0x16); |
| 633 | p1pll->lcd_pll_out_min = p1pll->pll_out_min; | ||
| 634 | p1pll->lcd_pll_out_max = p1pll->pll_out_max; | ||
| 636 | 635 | ||
| 637 | if (rev > 9) { | 636 | if (rev > 9) { |
| 638 | p1pll->pll_in_min = RBIOS32(pll_info + 0x36); | 637 | p1pll->pll_in_min = RBIOS32(pll_info + 0x36); |
