Module Name: xsrc
Committed By: veego
Date: Sun Sep 23 20:10:25 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: atombios_crtc.c
atombios_output.c radeon_crtc.c
Log Message:
Disable a lot of debug output which would show up if you change from the
xserver to another console and back
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.1.1.8 xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.1.1.8 Sun Sep 23 19:49:10 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c Sun Sep 23 20:10:25 2012
@@ -87,7 +87,7 @@ atombios_lock_crtc(atomBiosHandlePtr ato
data.exec.pspace = &crtc_data;
if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("%s CRTC %d success\n", lock? "Lock":"Unlock", crtc);
+/* ErrorF("%s CRTC %d success\n", lock? "Lock":"Unlock", crtc); */
return ATOM_SUCCESS ;
}
@@ -110,7 +110,7 @@ atombios_enable_crtc(atomBiosHandlePtr a
data.exec.pspace = &crtc_data;
if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("%s CRTC %d success\n", state? "Enable":"Disable", crtc);
+/* ErrorF("%s CRTC %d success\n", state? "Enable":"Disable", crtc); */
return ATOM_SUCCESS ;
}
@@ -133,7 +133,7 @@ atombios_enable_crtc_memreq(atomBiosHand
data.exec.pspace = &crtc_data;
if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("%s CRTC memreq %d success\n", state? "Enable":"Disable", crtc);
+/* ErrorF("%s CRTC memreq %d success\n", state? "Enable":"Disable", crtc); */
return ATOM_SUCCESS ;
}
@@ -157,7 +157,7 @@ atombios_blank_crtc(atomBiosHandlePtr at
data.exec.pspace = &crtc_data;
if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("%s CRTC %d success\n", state? "Blank":"Unblank", crtc);
+/* ErrorF("%s CRTC %d success\n", state? "Blank":"Unblank", crtc); */
return ATOM_SUCCESS ;
}
@@ -231,7 +231,7 @@ atombios_set_crtc_timing(xf86CrtcPtr crt
data.exec.pspace = ¶m;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set CRTC Timing success\n");
+/* ErrorF("Set CRTC Timing success\n"); */
return ATOM_SUCCESS ;
}
@@ -282,7 +282,7 @@ atombios_set_crtc_dtd_timing(xf86CrtcPtr
data.exec.pspace = ¶m;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set DTD CRTC Timing success\n");
+/* ErrorF("Set DTD CRTC Timing success\n"); */
return ATOM_SUCCESS ;
}
@@ -336,7 +336,7 @@ atombios_pick_pll(xf86CrtcPtr crtc)
} else
radeon_crtc->pll_id = radeon_crtc->crtc_id;
- ErrorF("Picked PLL %d\n", radeon_crtc->pll_id);
+/* ErrorF("Picked PLL %d\n", radeon_crtc->pll_id); */
for (o = 0; o < xf86_config->num_output; o++) {
output = xf86_config->output[o];
@@ -449,11 +449,11 @@ static uint32_t atombios_adjust_pll(xf86
args.v1.ucTransmitterID = radeon_encoder->encoder_id;
args.v1.ucEncodeMode = atombios_get_encoder_mode(output);
- ErrorF("before %d\n", args.v1.usPixelClock);
+/* ErrorF("before %d\n", args.v1.usPixelClock); */
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
adjusted_clock = le16_to_cpu(args.v1.usPixelClock) * 10;
}
- ErrorF("after %d\n", args.v1.usPixelClock);
+/* ErrorF("after %d\n", args.v1.usPixelClock); */
break;
case 3:
args.v3.sInput.usPixelClock = cpu_to_le16(adjusted_clock / 10);
@@ -467,7 +467,7 @@ static uint32_t atombios_adjust_pll(xf86
// if SS
// args.v3.sInput.ucDispPllConfig |= DISPPLL_CONFIG_SS_ENABLE;
- ErrorF("before %d 0x%x\n", args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig);
+/* ErrorF("before %d 0x%x\n", args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig); */
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
adjusted_clock = args.v3.sOutput.ulDispPllFreq * 10;
if (args.v3.sOutput.ucRefDiv) {
@@ -478,8 +478,8 @@ static uint32_t atombios_adjust_pll(xf86
pll_flags |= RADEON_PLL_USE_POST_DIV;
info->pll.post_div = args.v3.sOutput.ucPostDiv;
}
- ErrorF("after %d %d %d\n", args.v3.sOutput.ulDispPllFreq,
- args.v3.sOutput.ucRefDiv, args.v3.sOutput.ucPostDiv);
+/* ErrorF("after %d %d %d\n", args.v3.sOutput.ulDispPllFreq,
+ args.v3.sOutput.ucRefDiv, args.v3.sOutput.ucPostDiv); */
}
break;
default:
@@ -568,7 +568,7 @@ atombios_crtc_set_dcpll(xf86CrtcPtr crtc
data.exec.pspace = &args;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set DCPLL success\n");
+/* ErrorF("Set DCPLL success\n"); */
return;
}
@@ -710,7 +710,7 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc,
data.exec.pspace = &args;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set CRTC %d PLL success\n", radeon_crtc->crtc_id);
+/* ErrorF("Set CRTC %d PLL success\n", radeon_crtc->crtc_id); */
return;
}
@@ -991,8 +991,8 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
tilingChanged = RADEONSetTiling(pScrn);
}
- ErrorF("Mode %dx%d - %d %d %d\n", adjusted_mode->CrtcHDisplay, adjusted_mode->CrtcVDisplay,
- adjusted_mode->CrtcHTotal, adjusted_mode->CrtcVTotal, adjusted_mode->Flags);
+/* ErrorF("Mode %dx%d - %d %d %d\n", adjusted_mode->CrtcHDisplay, adjusted_mode->CrtcVDisplay,
+ adjusted_mode->CrtcHTotal, adjusted_mode->CrtcVTotal, adjusted_mode->Flags); */
RADEONInitMemMapRegisters(pScrn, info->ModeReg, info);
RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
Index: xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c:1.1.1.10 xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c:1.1.1.10 Sun Sep 23 19:49:26 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c Sun Sep 23 20:10:25 2012
@@ -234,7 +234,7 @@ atombios_output_dac_setup(xf86OutputPtr
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Output DAC%d setup success\n", num);
+/* ErrorF("Output DAC%d setup success\n", num); */
return ATOM_SUCCESS;
}
@@ -298,7 +298,7 @@ atombios_output_tv_setup(xf86OutputPtr o
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Output TV setup success\n");
+/* ErrorF("Output TV setup success\n"); */
return ATOM_SUCCESS;
}
@@ -333,7 +333,7 @@ atombios_external_tmds_setup(xf86OutputP
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("External TMDS setup success\n");
+/* ErrorF("External TMDS setup success\n"); */
return ATOM_SUCCESS;
}
@@ -364,7 +364,7 @@ atombios_output_ddia_setup(xf86OutputPtr
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("DDIA setup success\n");
+/* ErrorF("DDIA setup success\n"); */
return ATOM_SUCCESS;
}
@@ -503,7 +503,7 @@ atombios_output_digital_setup(xf86Output
data.exec.dataSpace = (void *)&space;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Output digital setup success\n");
+/* ErrorF("Output digital setup success\n"); */
return ATOM_SUCCESS;
}
@@ -826,7 +826,7 @@ atombios_output_dig_encoder_setup(xf86Ou
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Output DIG%d encoder setup success\n", radeon_output->dig_encoder);
+/* ErrorF("Output DIG%d encoder setup success\n", radeon_output->dig_encoder); */
return ATOM_SUCCESS;
}
@@ -1011,10 +1011,12 @@ atombios_output_dig_transmitter_setup(xf
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
+/*
if (IS_DCE32_VARIANT)
ErrorF("Output UNIPHY%d transmitter setup success\n", num);
else
ErrorF("Output DIG%d transmitter setup success\n", num);
+*/
return ATOM_SUCCESS;
}
@@ -1299,7 +1301,7 @@ atombios_output_yuv_setup(xf86OutputPtr
OUTREG(reg, temp);
- ErrorF("crtc %d YUV %s setup success\n", radeon_crtc->crtc_id, enable ? "enable" : "disable");
+/* ErrorF("crtc %d YUV %s setup success\n", radeon_crtc->crtc_id, enable ? "enable" : "disable"); */
return ATOM_SUCCESS;
}
@@ -1357,7 +1359,7 @@ atombios_output_overscan_setup(xf86Outpu
data.exec.pspace = &overscan_param;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set CRTC %d Overscan success\n", radeon_crtc->crtc_id);
+/* ErrorF("Set CRTC %d Overscan success\n", radeon_crtc->crtc_id); */
return ATOM_SUCCESS ;
}
@@ -1414,13 +1416,13 @@ atombios_output_scaler_setup(xf86OutputP
break;
}
disp_data.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
- ErrorF("Using TV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable);
+/* ErrorF("Using TV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable); */
} else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT)) {
disp_data.ucTVStandard = ATOM_TV_CV;
disp_data.ucEnable = SCALER_ENABLE_MULTITAP_MODE;
- ErrorF("Using CV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable);
+/* ErrorF("Using CV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable); */
} else if (radeon_output->Flags & RADEON_USE_RMX) {
- ErrorF("Using RMX\n");
+/* ErrorF("Using RMX\n"); */
if (radeon_output->rmx_type == RMX_FULL)
disp_data.ucEnable = ATOM_SCALER_EXPANSION;
else if (radeon_output->rmx_type == RMX_CENTER)
@@ -1428,7 +1430,7 @@ atombios_output_scaler_setup(xf86OutputP
else if (radeon_output->rmx_type == RMX_ASPECT)
disp_data.ucEnable = ATOM_SCALER_EXPANSION;
} else {
- ErrorF("Not using RMX\n");
+/* ErrorF("Not using RMX\n"); */
if (IS_AVIVO_VARIANT)
disp_data.ucEnable = ATOM_SCALER_DISABLE;
else
@@ -1442,10 +1444,10 @@ atombios_output_scaler_setup(xf86OutputP
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)
&& info->ChipFamily >= CHIP_FAMILY_RV515 && info->ChipFamily <= CHIP_FAMILY_RV570) {
- ErrorF("forcing TV scaler\n");
+/* ErrorF("forcing TV scaler\n"); */
atom_rv515_force_tv_scaler(output->scrn, radeon_crtc);
}
- ErrorF("scaler %d setup success\n", radeon_crtc->crtc_id);
+/* ErrorF("scaler %d setup success\n", radeon_crtc->crtc_id); */
return ATOM_SUCCESS;
}
@@ -1548,10 +1550,12 @@ atombios_output_dpms(xf86OutputPtr outpu
reg = INREG(RADEON_BIOS_3_SCRATCH);
OUTREG(RADEON_BIOS_3_SCRATCH, reg & ~ATOM_S3_DFP2I_ACTIVE);
}
- if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS)
+ if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) != ATOM_SUCCESS)
+/*
ErrorF("Output %s enable success\n",
device_name[radeon_get_device_index(radeon_output->active_device)]);
else
+*/
ErrorF("Output %s enable failed\n",
device_name[radeon_get_device_index(radeon_output->active_device)]);
if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DDI)
@@ -1581,10 +1585,12 @@ atombios_output_dpms(xf86OutputPtr outpu
data.exec.pspace = &disp_data;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data)
- == ATOM_SUCCESS)
+ != ATOM_SUCCESS)
+/*
ErrorF("Output %s disable success\n",
device_name[radeon_get_device_index(radeon_output->active_device)]);
else
+*/
ErrorF("Output %s disable failed\n",
device_name[radeon_get_device_index(radeon_output->active_device)]);
}
@@ -1735,7 +1741,7 @@ atombios_set_output_crtc_source(xf86Outp
data.exec.dataSpace = (void *)&space;
if (RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Set CRTC %d Source success\n", radeon_crtc->crtc_id);
+/* ErrorF("Set CRTC %d Source success\n", radeon_crtc->crtc_id); */
return;
}
@@ -2006,7 +2012,7 @@ atom_bios_dac_load_detect(atomBiosHandle
data.exec.pspace = &dac_data;
if (RHDAtomBiosFunc(atomBIOS->pScrn, atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) {
- ErrorF("Dac detection success\n");
+/* ErrorF("Dac detection success\n"); */
return ATOM_SUCCESS ;
}
@@ -2161,7 +2167,7 @@ RADEONDPEncoderService(xf86OutputPtr out
RHDAtomBiosFunc(info->atomBIOS->pScrn, info->atomBIOS, ATOMBIOS_EXEC, &data);
- ErrorF("%s: %d %d\n", __func__, action, args.ucStatus);
+/* ErrorF("%s: %d %d\n", __func__, action, args.ucStatus); */
return args.ucStatus;
}
@@ -2320,7 +2326,7 @@ atom_dp_i2c_address(I2CDevPtr dev, I2CSl
static Bool
atom_dp_i2c_start(I2CBusPtr bus, int timeout)
{
- ErrorF("%s\n", __func__);
+/* ErrorF("%s\n", __func__); */
return TRUE;
}
@@ -2467,8 +2473,8 @@ atom_dp_get_link_status(xf86OutputPtr ou
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "dp link status failed\n");
return FALSE;
}
- ErrorF("link status %02x %02x %02x %02x %02x %02x\n", link_status[0], link_status[1],
- link_status[2], link_status[3], link_status[4], link_status[5]);
+/* ErrorF("link status %02x %02x %02x %02x %02x %02x\n", link_status[0], link_status[1],
+ link_status[2], link_status[3], link_status[4], link_status[5]); */
return TRUE;
}
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.1.1.9 xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c:1.1.1.9 Sun Sep 23 19:49:35 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c Sun Sep 23 20:10:25 2012
@@ -170,7 +170,7 @@ RADEONComputePLL_old(RADEONPLLPtr pll,
freq = freq * 1000;
- ErrorF("freq: %lu\n", freq);
+/* ErrorF("freq: %lu\n", freq); */
if (flags & RADEON_PLL_USE_REF_DIV)
min_ref_div = max_ref_div = pll->reference_div;
@@ -300,11 +300,13 @@ RADEONComputePLL_old(RADEONPLLPtr pll,
}
}
+/*
ErrorF("best_freq: %u\n", (unsigned int)best_freq);
ErrorF("best_feedback_div: %u\n", (unsigned int)best_feedback_div);
ErrorF("best_frac_feedback_div: %u\n", (unsigned int)best_frac_feedback_div);
ErrorF("best_ref_div: %u\n", (unsigned int)best_ref_div);
ErrorF("best_post_div: %u\n", (unsigned int)best_post_div);
+*/
if (best_freq == -1)
FatalError("Couldn't find valid PLL dividers\n");
@@ -438,11 +440,13 @@ RADEONComputePLL_new(RADEONPLLPtr pll,
best_freq += pll->reference_freq * fb_div_frac;
best_freq = best_freq / (ref_div * post_div);
+/*
ErrorF("best_freq: %u\n", (unsigned int)best_freq);
ErrorF("best_feedback_div: %u\n", (unsigned int)fb_div);
ErrorF("best_frac_feedback_div: %u\n", (unsigned int)fb_div_frac);
ErrorF("best_ref_div: %u\n", (unsigned int)ref_div);
ErrorF("best_post_div: %u\n", (unsigned int)post_div);
+*/
done:
if (best_freq == 0)
