--- drivers/gpu/drm/radeon/radeon_atombios.c

+++ drivers/gpu/drm/radeon/radeon_atombios.c

@@ -152,6 +152,13 @@ static bool radeon_atom_apply_quirks(str

return false;

}

+ /* mac rv630, rv730, others */

+ if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&

+ (*connector_type == DRM_MODE_CONNECTOR_DVII)) {

+ *connector_type = DRM_MODE_CONNECTOR_9PinDIN;

+ *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;

+ }

+

/* ASUS HD 3600 XT board lists the DVI port as HDMI */

if ((dev->pdev->device == 0x9598) &&

(dev->pdev->subsystem_vendor == 0x1043) &&

@@ -1210,7 +1217,7 @@ void radeon_atom_initialize_bios_scratch

bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE;

/* tell the bios not to handle mode switching */

- bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH | ATOM_S6_ACC_MODE);

+ bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH;

if (rdev->family >= CHIP_R600) {

WREG32(R600_BIOS_2_SCRATCH, bios_2_scratch);

@@ -1261,10 +1268,13 @@ void radeon_atom_output_lock(struct drm_

else

bios_6_scratch = RREG32(RADEON_BIOS_6_SCRATCH);

- if (lock)

+ if (lock) {

bios_6_scratch |= ATOM_S6_CRITICAL_STATE;

- else

+ bios_6_scratch &= ~ATOM_S6_ACC_MODE;

+ } else {

bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE;

+ bios_6_scratch |= ATOM_S6_ACC_MODE;

+ }

if (rdev->family >= CHIP_R600)

WREG32(R600_BIOS_6_SCRATCH, bios_6_scratch);