---

yaml --- r: 287806 b: refs/heads/master c: 3ac0eb6 h: refs/heads/master v: v3
git-mirror · Feb 22, 2012 · 33f6efc · 33f6efc
1 parent ce48bfe
commit 33f6efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7746e8768e1c550b320d5af761f73e5aa37f76
+refs/heads/master: 3ac0eb6d62fde0a60a6c5c61e562af1db8fbf712
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c b/trunk/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