drm/radeon/DCE4+: clear bios scratch dpms bit (v2)
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Jan 2014 23:29:35 +0000 (18:29 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 29 Jan 2014 21:10:53 +0000 (16:10 -0500)
The BlankCrtc table in some DCE8 boards has some
logic shortcuts for the vbios when this bit is set.
Clear it for driver use.

v2: fix typo

Bug:
https://bugs.freedesktop.org/show_bug.cgi?id=73420

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_atombios.c

index f48bd6dc10cda2a9c993879c65f5fac574702728..30844814c25a3c931a286b6823b54c88a0bbf348 100644 (file)
@@ -3938,6 +3938,10 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)
        /* tell the bios not to handle mode switching */
        bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH;
 
+       /* clear the vbios dpms state */
+       if (ASIC_IS_DCE4(rdev))
+               bios_2_scratch &= ~ATOM_S2_DEVICE_DPMS_STATE;
+
        if (rdev->family >= CHIP_R600) {
                WREG32(R600_BIOS_2_SCRATCH, bios_2_scratch);
                WREG32(R600_BIOS_6_SCRATCH, bios_6_scratch);