diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-15 15:38:47 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-15 15:38:47 +0000 |
| commit | 1926a2d5ae95c4a1451f37e083424271a3fc23c1 (patch) | |
| tree | 227e983ece5b028859f07116f39d47bfb46e4871 /sys/dev/pci/drm | |
| parent | e2d4b5feb6fd3f5141c672e62c386255dcbe28f9 (diff) | |
drm/radeon/DCE4+: clear bios scratch dpms bit (v2)
From Alex Deucher
5e47f3719629ddfbb33326a3446d521f1a78c3b4 in ubuntu 3.8
6802d4bad83f50081b2788698570218aaff8d10e in mainline linux
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_atombios.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_atombios.c b/sys/dev/pci/drm/radeon/radeon_atombios.c index 17d736d674c..98c47d3971b 100644 --- a/sys/dev/pci/drm/radeon/radeon_atombios.c +++ b/sys/dev/pci/drm/radeon/radeon_atombios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_atombios.c,v 1.4 2014/02/10 00:40:38 jsg Exp $ */ +/* $OpenBSD: radeon_atombios.c,v 1.5 2014/02/15 15:38:46 jsg Exp $ */ /* * Copyright 2007-8 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -2834,6 +2834,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); |