| 1548,6 → 1548,9 |
|---|
| of_machine_is_compatible("PowerBook6,7")) { |
| /* ibook */ |
| rdev->mode_info.connector_table = CT_IBOOK; |
| } else if (of_machine_is_compatible("PowerMac3,5")) { |
| /* PowerMac G4 Silver radeon 7500 */ |
| rdev->mode_info.connector_table = CT_MAC_G4_SILVER; |
| } else if (of_machine_is_compatible("PowerMac4,4")) { |
| /* emac */ |
| rdev->mode_info.connector_table = CT_EMAC; |
| 2212,6 → 2215,54 |
|---|
| CONNECTOR_OBJECT_ID_SVIDEO, |
| &hpd); |
| break; |
| case CT_MAC_G4_SILVER: |
| DRM_INFO("Connector Table: %d (mac g4 silver)\n", |
| rdev->mode_info.connector_table); |
| /* DVI-I - tv dac, int tmds */ |
| ddc_i2c = combios_setup_i2c_bus(rdev, DDC_DVI, 0, 0); |
| hpd.hpd = RADEON_HPD_1; /* ??? */ |
| radeon_add_legacy_encoder(dev, |
| radeon_get_encoder_enum(dev, |
| ATOM_DEVICE_DFP1_SUPPORT, |
| 0), |
| ATOM_DEVICE_DFP1_SUPPORT); |
| radeon_add_legacy_encoder(dev, |
| radeon_get_encoder_enum(dev, |
| ATOM_DEVICE_CRT2_SUPPORT, |
| 2), |
| ATOM_DEVICE_CRT2_SUPPORT); |
| radeon_add_legacy_connector(dev, 0, |
| ATOM_DEVICE_DFP1_SUPPORT | |
| ATOM_DEVICE_CRT2_SUPPORT, |
| DRM_MODE_CONNECTOR_DVII, &ddc_i2c, |
| CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I, |
| &hpd); |
| /* VGA - primary dac */ |
| ddc_i2c = combios_setup_i2c_bus(rdev, DDC_VGA, 0, 0); |
| hpd.hpd = RADEON_HPD_NONE; |
| radeon_add_legacy_encoder(dev, |
| radeon_get_encoder_enum(dev, |
| ATOM_DEVICE_CRT1_SUPPORT, |
| 1), |
| ATOM_DEVICE_CRT1_SUPPORT); |
| radeon_add_legacy_connector(dev, 1, ATOM_DEVICE_CRT1_SUPPORT, |
| DRM_MODE_CONNECTOR_VGA, &ddc_i2c, |
| CONNECTOR_OBJECT_ID_VGA, |
| &hpd); |
| /* TV - TV DAC */ |
| ddc_i2c.valid = false; |
| hpd.hpd = RADEON_HPD_NONE; |
| radeon_add_legacy_encoder(dev, |
| radeon_get_encoder_enum(dev, |
| ATOM_DEVICE_TV1_SUPPORT, |
| 2), |
| ATOM_DEVICE_TV1_SUPPORT); |
| radeon_add_legacy_connector(dev, 2, ATOM_DEVICE_TV1_SUPPORT, |
| DRM_MODE_CONNECTOR_SVIDEO, |
| &ddc_i2c, |
| CONNECTOR_OBJECT_ID_SVIDEO, |
| &hpd); |
| break; |
| default: |
| DRM_INFO("Connector table: %d (invalid)\n", |
| rdev->mode_info.connector_table); |
| 3246,11 → 3297,9 |
|---|
| while (ram--) { |
| addr = ram * 1024 * 1024; |
| /* write to each page */ |
| WREG32(RADEON_MM_INDEX, (addr) | RADEON_MM_APER); |
| WREG32(RADEON_MM_DATA, 0xdeadbeef); |
| WREG32_IDX((addr) | RADEON_MM_APER, 0xdeadbeef); |
| /* read back and verify */ |
| WREG32(RADEON_MM_INDEX, (addr) | RADEON_MM_APER); |
| if (RREG32(RADEON_MM_DATA) != 0xdeadbeef) |
| if (RREG32_IDX((addr) | RADEON_MM_APER) != 0xdeadbeef) |
| return 0; |
| } |
| |