rpms/kernel/F-12 drm-radeon-rv410-test-fix.patch, NONE, 1.1 kernel.spec, 1.1946, 1.1947

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30946

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-rv410-test-fix.patch 
Log Message:
* Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
- rv410 LVDS on resume test fix from AMD (#541562)


drm-radeon-rv410-test-fix.patch:
 atombios_crtc.c          |    4 ----
 radeon_legacy_encoders.c |    4 ----
 2 files changed, 8 deletions(-)

--- NEW FILE drm-radeon-rv410-test-fix.patch ---
>From 5eecd2f0071edd335977b1ce15fd73b804f17e3c Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher at gmail.com>
Date: Wed, 2 Dec 2009 17:56:41 -0500
Subject: [PATCH] drm/radeon/kms: further r4xx lvds fixes

- Let the driver calculate the ref div
- Use the driver programmed pll dividers

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
---
 drivers/gpu/drm/radeon/atombios_crtc.c          |    4 ----
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 89ac438..7a8cd93 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -457,10 +457,6 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 				if (encoder->encoder_type !=
 				    DRM_MODE_ENCODER_DAC)
 					pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-				if (!ASIC_IS_AVIVO(rdev)
-				    && (encoder->encoder_type ==
-					DRM_MODE_ENCODER_LVDS))
-					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
 			break;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index df00515..7c7c009 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -181,9 +181,6 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
 	WREG32(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 	WREG32(RADEON_LVDS_SS_GEN_CNTL, lvds_ss_gen_cntl);
 
-	if (rdev->family == CHIP_RV410)
-		WREG32(RADEON_CLOCK_CNTL_INDEX, 0);
-
 	if (rdev->is_atom_bios)
 		radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
 	else
-- 
1.5.6.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -p -r1.1946 -r1.1947
--- kernel.spec	2 Dec 2009 20:51:22 -0000	1.1946
+++ kernel.spec	2 Dec 2009 23:02:45 -0000	1.1947
@@ -726,6 +726,7 @@ Patch1834: drm-edid-header-fixup.patch
 Patch1835: drm-default-mode.patch
 Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1839: drm-radeon-misc-fixes.patch
+Patch1840: drm-radeon-rv410-test-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1427,6 +1428,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
 ApplyPatch drm-radeon-misc-fixes.patch
+ApplyPatch drm-radeon-rv410-test-fix.patch
 ApplyPatch drm-conservative-fallback-modes.patch
 ApplyPatch drm-edid-retry.patch
 ApplyPatch drm-edid-header-fixup.patch
@@ -2159,6 +2161,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
+- rv410 LVDS on resume test fix from AMD (#541562)
+
 * Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.31.6-160
 - ath9k: add fixes suggested by upstream maintainer