Rev 1986 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1986 | Rev 2160 | ||
|---|---|---|---|
| Line 777... | Line 777... | ||
| 777 | rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK"); |
777 | rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK"); |
| 778 | break; |
778 | break; |
| 779 | } |
779 | } |
| 780 | } |
780 | } |
| 781 | } |
781 | } |
| 782 | } else if (rdev->family >= CHIP_R200) { |
782 | } else if ((rdev->family == CHIP_R200) || |
| - | 783 | (rdev->family >= CHIP_R300)) { |
|
| 783 | /* 0x68 */ |
784 | /* 0x68 */ |
| 784 | i2c = combios_setup_i2c_bus(rdev, DDC_MONID, 0, 0); |
785 | i2c = combios_setup_i2c_bus(rdev, DDC_MONID, 0, 0); |
| 785 | rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID"); |
786 | rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID"); |
| 786 | } else { |
787 | } else { |
| 787 | /* 0x68 */ |
788 | /* 0x68 */ |
| Line 2554... | Line 2555... | ||
| 2554 | { |
2555 | { |
| 2555 | struct drm_device *dev = rdev->ddev; |
2556 | struct drm_device *dev = rdev->ddev; |
| 2556 | u16 offset, misc, misc2 = 0; |
2557 | u16 offset, misc, misc2 = 0; |
| 2557 | u8 rev, blocks, tmp; |
2558 | u8 rev, blocks, tmp; |
| 2558 | int state_index = 0; |
2559 | int state_index = 0; |
| - | 2560 | struct radeon_i2c_bus_rec i2c_bus; |
|
| Line 2559... | Line 2561... | ||
| 2559 | 2561 | ||
| Line 2560... | Line 2562... | ||
| 2560 | rdev->pm.default_power_state_index = -1; |
2562 | rdev->pm.default_power_state_index = -1; |
| 2561 | 2563 | ||
| Line 2572... | Line 2574... | ||
| 2572 | 2574 | ||
| 2573 | /* check for a thermal chip */ |
2575 | /* check for a thermal chip */ |
| 2574 | offset = combios_get_table_offset(dev, COMBIOS_OVERDRIVE_INFO_TABLE); |
2576 | offset = combios_get_table_offset(dev, COMBIOS_OVERDRIVE_INFO_TABLE); |
| 2575 | if (offset) { |
2577 | if (offset) { |
| 2576 | u8 thermal_controller = 0, gpio = 0, i2c_addr = 0, clk_bit = 0, data_bit = 0; |
- | |
| Line 2577... | Line 2578... | ||
| 2577 | struct radeon_i2c_bus_rec i2c_bus; |
2578 | u8 thermal_controller = 0, gpio = 0, i2c_addr = 0, clk_bit = 0, data_bit = 0; |
| Line 2578... | Line 2579... | ||
| 2578 | 2579 | ||
| 2579 | rev = RBIOS8(offset); |
2580 | rev = RBIOS8(offset); |