From: Alex Deucher Date: Mon, 20 Feb 2012 02:42:03 +0000 (-0500) Subject: drm/radeon/kms/atom: dpms bios scratch reg updates X-Git-Tag: firefly_0821_release~3680^2~3498^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3ac0eb6d62fde0a60a6c5c61e562af1db8fbf712;p=firefly-linux-kernel-4.4.55.git drm/radeon/kms/atom: dpms bios scratch reg updates dpms bits not used on DCE4+ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 9e72daeeddc6..1f53ae74ada1 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -3020,6 +3020,9 @@ radeon_atombios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on) struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); uint32_t bios_2_scratch; + if (ASIC_IS_DCE4(rdev)) + return; + if (rdev->family >= CHIP_R600) bios_2_scratch = RREG32(R600_BIOS_2_SCRATCH); else