--- a/XORG_NV/sun-src/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	Mon Jun 12 11:08:27 2006 -0700
+++ b/XORG_NV/sun-src/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	Mon Jun 12 13:53:11 2006 -0700
@@ -323,6 +323,8 @@
 }
 
 
+extern xf86MonPtr nvProbeDDC(ScrnInfoPtr pScrn, int index);
+
 void
 NVCommonSetup(ScrnInfoPtr pScrn)
 {
@@ -470,7 +472,11 @@
 
     if(!pNv->twoHeads) {
        pNv->CRTCnumber = 0;
-       if((monitorA = NVProbeDDC(pScrn, 0))) {
+       if(!(monitorA = NVProbeDDC(pScrn, 0)))
+              monitorA = nvProbeDDC(pScrn, 
+              	xf86GetEntityInfo(pScrn->entityList[0])->index);
+
+       if (monitorA) {
            FlatPanel = monitorA->features.input_type ? 1 : 0;
 
            /* NV4 doesn't support FlatPanels */
@@ -557,6 +563,10 @@
        monitorA = NVProbeDDC(pScrn, 0);
        monitorB = NVProbeDDC(pScrn, 1);
 
+       if (!monitorA && !monitorB)
+              monitorA = nvProbeDDC(pScrn, 
+              	xf86GetEntityInfo(pScrn->entityList[0])->index);
+
        if(slaved_on_A && !tvA) {
           CRTCnumber = 0;
           FlatPanel = 1;