Fix logic cut and paste error

2 files changed, 16 insertions, 12 deletions

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 56bbdf93..6af7f124 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -74,9 +74,9 @@ atombios_output_dac_setup(xf86OutputPtr output, DisplayModePtr mode)
 
     disp_data.ucAction = ATOM_ENABLE;
 
-    if (radeon_output->active_device && (ATOM_DEVICE_CRT_SUPPORT))
+    if (radeon_output->active_device & (ATOM_DEVICE_CRT_SUPPORT))
 	disp_data.ucDacStandard = ATOM_DAC1_PS2;
-    else if (radeon_output->active_device && (ATOM_DEVICE_CV_SUPPORT))
+    else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
 	disp_data.ucDacStandard = ATOM_DAC1_CV;
     else {
 	switch (radeon_output->tvStd) {
@@ -124,7 +124,7 @@ atombios_output_tv_setup(xf86OutputPtr output, DisplayModePtr mode)
 
     disp_data.sTVEncoder.ucAction = ATOM_ENABLE;
 
-    if (radeon_output->active_device && (ATOM_DEVICE_CV_SUPPORT))
+    if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT))
 	disp_data.sTVEncoder.ucTvStandard = ATOM_TV_CV;
     else {
 	switch (radeon_output->tvStd) {
@@ -264,7 +264,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
 	break;
     case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-	if (radeon_output->active_device && (ATOM_DEVICE_LCD_SUPPORT))
+	if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT))
 	    index = GetIndexIntoMasterTable(COMMAND, LVDSEncoderControl);
 	else
 	    index = GetIndexIntoMasterTable(COMMAND, TMDS2EncoderControl);
@@ -285,7 +285,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
 	    if (radeon_output->type == OUTPUT_HDMI)
 		disp_data.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
 	    disp_data.usPixelClock = cpu_to_le16(mode->Clock / 10);
-	    if (radeon_output->active_device && (ATOM_DEVICE_LCD_SUPPORT)) {
+	    if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {
 		if (radeon_output->lvds_misc & (1 << 0))
 		    disp_data.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 		if (radeon_output->lvds_misc & (1 << 1))
@@ -317,7 +317,7 @@ atombios_output_digital_setup(xf86OutputPtr output, DisplayModePtr mode)
 	    disp_data2.ucSpatial = 0;
 	    disp_data2.ucTemporal = 0;
 	    disp_data2.ucFRC = 0;
-	    if (radeon_output->active_device && (ATOM_DEVICE_LCD_SUPPORT)) {
+	    if (radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) {
 		if (radeon_output->lvds_misc & (1 << 0))
 		    disp_data2.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 		if (radeon_output->lvds_misc & (1 << 5)) {
diff --git a/src/legacy_output.c b/src/legacy_output.c
index a35d0bbd..a7222533 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -763,7 +763,7 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable)
 	    RADEONDacPowerSet(pScrn, bEnable, TRUE);
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_DAC2:
-	    if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) {
+	    if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) {
 		ErrorF("enable TV\n");
 		info->output_tv1 |= (1 << o);
 		tmp = INREG(RADEON_TV_MASTER_CNTL);
@@ -861,11 +861,11 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable)
 		tmp &= ~RADEON_CRTC_CRT_ON;
 		OUTREG(RADEON_CRTC_EXT_CNTL, tmp);
 		save->crtc_ext_cntl &= ~RADEON_CRTC_CRT_ON;
-		RADEONDacPowerSet(pScrn, bEnable, (radeon_output->DACType == DAC_PRIMARY));
+		RADEONDacPowerSet(pScrn, bEnable, TRUE);
 	    }
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_DAC2:
-	    if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) {
+	    if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) {
 		ErrorF("disable TV\n");
 		info->output_tv1 &= ~(1 << o);
 		tv_dac_change = 2;
@@ -1197,8 +1197,11 @@ RADEONInitRMXRegisters(xf86OutputPtr output, RADEONSavePtr save,
 
     save->fp_horz_vert_active = 0;
 
-    if ((radeon_output->active_device && (ATOM_DEVICE_LCD_SUPPORT)) ||
-	(radeon_output->active_device && (ATOM_DEVICE_DFP_SUPPORT))) {
+    if ((radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) ||
+	(radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT))) {
+
+	ErrorF("RMX for DFP/LCD\n");
+
 	if (radeon_output->PanelXRes == 0 || radeon_output->PanelYRes == 0) {
 	    Hscale = FALSE;
 	    Vscale = FALSE;
@@ -1409,6 +1412,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 	return;
 
     if (radeon_crtc->crtc_id == 0) {
+	ErrorF("set RMX\n");
 	is_primary = TRUE;
 	RADEONInitRMXRegisters(output, info->ModeReg, adjusted_mode);
 	RADEONRestoreRMXRegisters(pScrn, info->ModeReg);
@@ -1454,7 +1458,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 	RADEONRestoreDACRegisters(pScrn, info->ModeReg);
 	break;
     case ENCODER_OBJECT_ID_INTERNAL_DAC2:
-	if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) {
+	if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) {
 	    ErrorF("set TV\n");
 	    RADEONInitTVRegisters(output, info->ModeReg, adjusted_mode, is_primary);
 	    RADEONRestoreDACRegisters(pScrn, info->ModeReg);