diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-01-27 18:29:35 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:55:40 -0800 |
| commit | 6f59ee2091db655d08da7822a7c25e470f349c7b (patch) | |
| tree | aba3d3888d6c74f0fc605082d8acf152bca00eb0 /drivers/gpu | |
| parent | fe095e6db1b91d605f0f79903a3a544aaea7caba (diff) | |
| download | linux-stable-6f59ee2091db655d08da7822a7c25e470f349c7b.tar.gz linux-stable-6f59ee2091db655d08da7822a7c25e470f349c7b.tar.bz2 linux-stable-6f59ee2091db655d08da7822a7c25e470f349c7b.zip | |
drm/radeon/DCE4+: clear bios scratch dpms bit (v2)
commit 6802d4bad83f50081b2788698570218aaff8d10e upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 5c39bf7c3d88..dfa641277175 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -3944,6 +3944,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); |