upstream/oracle/x-cons/x-s11-update-clone: comparison XORG_NV/sun-src/xf86-video-ati-6.5.8.0/src/radeon

equal deleted inserted replaced

-:235a80428f96
+:36c599198505
 static int RADEONValidateMergeModes(ScrnInfoPtr pScrn);
 static void RADEONSetDynamicClock(ScrnInfoPtr pScrn, int mode);
 static void RADEONUpdatePanelSize(ScrnInfoPtr pScrn);
 static void RADEONSaveMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save);
 static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save);
+static xf86MonPtr RADEONProbeDDC(ScrnInfoPtr pScrn, int indx);
+static RADEONMonitorType RADEONCrtIsPhysicallyConnected(ScrnInfoPtr pScrn, int IsCrtDac);
 /* psuedo xinerama support */
 extern Bool 		RADEONnoPanoramiXExtension;
 unsigned char *RADEONMMIO = info->MMIO;
 unsigned long DDCReg;
 RADEONMonitorType MonType = MT_NONE;
 xf86MonPtr* MonInfo = &port->MonInfo;
 int i, j;
+RADEONEntPtr pRADEONEnt  = RADEONEntPriv(pScrn);
+int vbeProbe = FALSE;;
 DDCReg = info->DDCReg;
 switch(DDCType)
 {
 case DDC_MONID:
 case DDC_CRT2:
 	info->DDCReg = RADEON_GPIO_CRT2_DDC;
 	break;
 default:
 	info->DDCReg = DDCReg;
+	/* Fall through, can still try ...
 	return MT_NONE;
+	*/
 }
 /* Read and output monitor info using DDC2 over I2C bus */
 if (info->pI2CBus && info->ddc2) {
 	OUTREG(info->DDCReg, INREG(info->DDCReg) &
 }
 OUTREG(info->DDCReg, INREG(info->DDCReg) &
 	   ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1));
+if ((!*MonInfo) && ((port == &pRADEONEnt->PortInfo[0]) ||
+	(RADEONCrtIsPhysicallyConnected(pScrn, !(pRADEONEnt->PortInfo[1].DACType))
+	== MT_CRT))) {
+	vbeProbe = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBE DDC probing on port %d ::: \n",
+	    (port == &pRADEONEnt->PortInfo[0])? 1:2);
+	*MonInfo = RADEONProbeDDC(pScrn, info->pEnt->index);
+}
 if (*MonInfo) {
 	if ((*MonInfo)->rawData[0x14] & 0x80) {
 	    /* Note some laptops have a DVI output that uses internal TMDS,
 	     * when its DVI is enabled by hotkey, LVDS panel is not used.
 	     * In this case, the laptop is configured as DVI+VGA as a normal
 	     * desktop card.
 	     * Also for laptop, when X starts with lid closed (no DVI connection)
 	     * both LDVS and TMDS are disable, we still need to treat it as a LVDS panel.
 	     */
-	    if (port->TMDSType == TMDS_EXT) MonType = MT_DFP;
+	    if (vbeProbe &&
-	    else {
+		(RADEONCrtIsPhysicallyConnected(pScrn, !(port->DACType)) == MT_CRT)) {
-		if ((INREG(RADEON_FP_GEN_CNTL) & (1<<7)) || !info->IsMobility)
+	    	    MonType = MT_NONE;
-		    MonType = MT_DFP;
+	    	    *MonInfo = NULL;
-		else
+		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBE probed DDC info nullified on port %d :::\n", (port == &pRADEONEnt->PortInfo[0])? 1:2);
-		    MonType = MT_LCD;
+		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "CRT physically connected but digital device indicated in DDC\n");
+	    } else {
+		if (port->TMDSType == TMDS_EXT) MonType = MT_DFP;
+	    	else {
+		    if ((INREG(RADEON_FP_GEN_CNTL) & (1<<7)) || !info->IsMobility)
+		    	MonType = MT_DFP;
+		    else
+		    	MonType = MT_LCD;
+		}
 	    }
-	} else MonType = MT_CRT;
+	} else  {
+	    	if ((RADEONCrtIsPhysicallyConnected(pScrn,
+		    !(pRADEONEnt->PortInfo[1].DACType)) == MT_CRT) &&
+	 	    (port == &pRADEONEnt->PortInfo[0])) {
+	    	    MonType = MT_NONE;
+	    	    *MonInfo = NULL;
+		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC info nullified on port 1 :::\n");
+		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Analog device indicated in DDC and port 1 CRT physically connected\n");
+		} else
+	    	    MonType = MT_CRT;
+	}
 } else MonType = MT_NONE;
 info->DDCReg = DDCReg;
 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 * try to probe it
 */
 if(IsCrtDac) {
 	unsigned long ulOrigVCLK_ECP_CNTL;
 	unsigned long ulOrigDAC_CNTL;
+	unsigned long ulOrigDAC_MACRO_CNTL;
 	unsigned long ulOrigDAC_EXT_CNTL;
 	unsigned long ulOrigCRTC_EXT_CNTL;
 	unsigned long ulData;
 	unsigned long ulMask;
 	    ulData |= (0x01ac << RADEON_DAC_FORCE_DATA_SHIFT);
 	OUTREG(RADEON_DAC_EXT_CNTL, ulData);
 	ulOrigDAC_CNTL     = INREG(RADEON_DAC_CNTL);
+	if (ulOrigDAC_CNTL & RADEON_DAC_PDWN) {
+	    /* turn on power so testing can go through */
+	    ulOrigDAC_MACRO_CNTL = INREG(RADEON_DAC_MACRO_CNTL);
+	    ulOrigDAC_MACRO_CNTL &= ~(RADEON_DAC_PDWN_R | RADEON_DAC_PDWN_G |
+		RADEON_DAC_PDWN_B);
+	    OUTREG(RADEON_DAC_MACRO_CNTL, ulOrigDAC_MACRO_CNTL);
+	}
 	ulData             = ulOrigDAC_CNTL;
 	ulData            |= RADEON_DAC_CMP_EN;
 	ulData            &= ~(RADEON_DAC_RANGE_CNTL_MASK
 			       | RADEON_DAC_PDWN);
 	ulData            |= 0x2;
 	OUTREG(RADEON_DAC_CNTL, ulData);
 	usleep(10000);
 	ulData     = INREG(RADEON_DAC_CNTL);
 	OUTPLLP(pScrn, RADEON_VCLK_ECP_CNTL, ulData, ulMask);
 	OUTREG(RADEON_DAC_CNTL,      ulOrigDAC_CNTL     );
 	OUTREG(RADEON_DAC_EXT_CNTL,  ulOrigDAC_EXT_CNTL );
 	OUTREG(RADEON_CRTC_EXT_CNTL, ulOrigCRTC_EXT_CNTL);
+	if (!bConnected) {
+	    /* Power DAC down if CRT is not connected */
+ulOrigDAC_MACRO_CNTL = INREG(RADEON_DAC_MACRO_CNTL);
+ulOrigDAC_MACRO_CNTL |= (RADEON_DAC_PDWN_R | RADEON_DAC_PDWN_G |
+	    	RADEON_DAC_PDWN_B);
+OUTREG(RADEON_DAC_MACRO_CNTL, ulOrigDAC_MACRO_CNTL);
+	    ulData     = INREG(RADEON_DAC_CNTL);
+	    ulData     |= RADEON_DAC_PDWN ;
+	    OUTREG(RADEON_DAC_CNTL, ulData);
+	}
 } else { /* TV DAC */
 /* This doesn't seem to work reliably (maybe worse on some OEM cards),
 for now we always return false. If one wants to connected a
 non-DDC monitor on the DVI port when CRT port is also connected,
 	pRADEONEnt->PortInfo[i].DACType = DAC_UNKNOWN;
 	pRADEONEnt->PortInfo[i].TMDSType = TMDS_UNKNOWN;
 	pRADEONEnt->PortInfo[i].ConnectorType = CONNECTOR_NONE;
 }
-if (!RADEONGetConnectorInfoFromBIOS(pScrn)) {
+if (!RADEONGetConnectorInfoFromBIOS(pScrn) ||
+	((pRADEONEnt->PortInfo[0].DDCType == 0) &&
+	(pRADEONEnt->PortInfo[1].DDCType == 0))) {
 	/* Below is the most common setting, but may not be true */
 	pRADEONEnt->PortInfo[0].MonType = MT_UNKNOWN;
 	pRADEONEnt->PortInfo[0].MonInfo = NULL;
 	pRADEONEnt->PortInfo[0].DDCType = DDC_DVI;
 	pRADEONEnt->PortInfo[0].DACType = DAC_TVDAC;
 info->video_decoder_type+=(((int)info->VBIOS[pll_info_block+0x09]+0)<<8);
 return TRUE;
 }
-static void
+static xf86MonPtr
 RADEONProbeDDC(ScrnInfoPtr pScrn, int indx)
 {
 vbeInfoPtr  pVbe;
+xf86MonPtr monitor;
 if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,indx);
-	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+	monitor = vbeDoEDID(pVbe, NULL);
-}
+	return (monitor);
+} else
+	return (NULL);
 }
 _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
 {
 RADEONInfoPtr     info;
 	    pRADEONEnt->IsSecondaryRestored = FALSE;
 	}
 }
 if (flags & PROBE_DETECT) {
-	RADEONProbeDDC(pScrn, info->pEnt->index);
+	ConfiguredMonitor = RADEONProbeDDC(pScrn, info->pEnt->index);
 	RADEONPostInt10Check(pScrn, int10_save);
 	if(info->MMIO) RADEONUnmapMMIO(pScrn);
 	return TRUE;
 }

changeset 33	36c599198505
parent 28	d7de7f091eb4
child 45	56271cedb955