diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 559c9ce..4dd30f0 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -1438,6 +1438,70 @@ atombios_dac_load_detect(struct drm_encoder *encoder, struct drm_connector *conn
 }
 
 static enum drm_connector_status
+radeon_r4xx_primary_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+	struct drm_device *dev = encoder->dev;
+	struct radeon_device *rdev = dev->dev_private;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+
+	u32 tmp;
+	u32 vclk_ecp_cntl, crtc_ext_cntl, dac_cntl, dac_macro_cntl, dac_ext_cntl;
+      
+	tmp = RREG32(RADEON_DISP_OUTPUT_CNTL);
+	tmp &= 0xfffffffc;
+	WREG32(RADEON_DISP_OUTPUT_CNTL, tmp);
+
+	vclk_ecp_cntl = RREG32_PLL(RADEON_VCLK_ECP_CNTL);
+	crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);
+	dac_cntl = RREG32(RADEON_DAC_CNTL);
+
+	dac_macro_cntl = RREG32(RADEON_DAC_MACRO_CNTL);
+
+	dac_ext_cntl = RREG32(RADEON_DAC_EXT_CNTL);
+	
+}
+
+static enum drm_connector_status
+radeon_r4xx_tv_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+		struct drm_device *dev = encoder->dev;
+	struct radeon_device *rdev = dev->dev_private;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+
+	u32 dac_cntl2, crtc2_gen_cntl, tv_dac_cntl;
+
+	dac_cntl2 = RREG32(RADEON_DAC_CNTL2);
+	crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL);
+	tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL);
+}
+
+static enum drm_connector_status
+radeon_r4xx_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
+{
+	struct drm_device *dev = encoder->dev;
+	struct radeon_device *rdev = dev->dev_private;
+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+	bool dac_a = false;
+
+	if (!(radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT |
+					 ATOM_DEVICE_CV_SUPPORT |
+					 ATOM_DEVICE_CRT_SUPPORT)))
+		return false;
+
+	
+	if ((radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) ||
+	    (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+		return radeon_r4xx_primary_dac_detect(encoder, connector);
+	else
+		return radeon_r4xx_tv_dac_detect(encoder, connector);
+	
+}
+
+
+static enum drm_connector_status
 radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 {
 	struct drm_device *dev = encoder->dev;
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index c3890b7..12793e7 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -48,7 +48,7 @@ int rs600_mc_wait_for_idle(struct radeon_device *rdev);
 
 void rs600_pm_misc(struct radeon_device *rdev)
 {
-#if 0
+#if 1
 	int requested_index = rdev->pm.requested_power_state_index;
 	struct radeon_power_state *ps = &rdev->pm.power_state[requested_index];
 	struct radeon_voltage *voltage = &ps->clock_info[0].voltage;