Re: Rivafb won't work with DVI connector

["Antonino A. Daplas" <adaplas@hotpop.com>]

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

On Wednesday 24 November 2004 00:08, Andrew Walrond wrote:
> On Tuesday 23 Nov 2004 15:18, Antonino A. Daplas wrote:
> > On Tuesday 23 November 2004 23:09, Andrew Walrond wrote:
> > > On Tuesday 23 Nov 2004 14:28, Antonino A. Daplas wrote:
> > > > Okay, try the attached patch.
> > >
> > > Ok, booting on dsub without params now results in a good 1024x768
> > > (128x48) console and boots cleanly. (Note this was a 1600x1200
> > > (200xwhatever) before the patch, which is the preferred, native
> > > resolution of the screen.)
>
> Actually, I think this is die to having both dsub and dvi attached during
> that test. Just dsub boots to 1600x1200 as before
>

Okay, I think I this should fix the dvi misdetection, and I think it should
also fix the preferred timing of 1600x1200 even if both dsub and dvi are
attached.  Try the attached patch.

Tony

[-- Attachment #2: nvidiafb2-inc3.diff --]
[-- Type: text/x-diff, Size: 1571 bytes --]

diff -Nru a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
--- a/drivers/video/nvidia/nv_setup.c	2004-11-23 22:19:56 +08:00
+++ b/drivers/video/nvidia/nv_setup.c	2004-11-24 01:02:51 +08:00
@@ -400,7 +400,7 @@
 			printk("nvidiafb: EDID found from BUS1\n");
 			monA = &monitorA;
 			fb_edid_to_monspecs(edidA, monA);
-			FlatPanel = (monA->input == FB_DISP_DDI) ? 1 : 0;
+			FlatPanel = (monA->input & FB_DISP_DDI) ? 1 : 0;
 			
 			/* NV4 doesn't support FlatPanels */
 			if((par->Chipset & 0x0fff) <= 0x0020)
@@ -531,9 +531,9 @@
 			printk("nvidiafb: CRTC 1 is currently programmed for "
 			       "TV\n");
 		} else if (monA) {
-			FlatPanel = (monA->input == FB_DISP_DDI) ? 1 : 0;
+			FlatPanel = (monA->input & FB_DISP_DDI) ? 1 : 0;
 		} else if (monB) {
-			FlatPanel = (monB->input == FB_DISP_DDI) ? 1 : 0;
+			FlatPanel = (monB->input & FB_DISP_DDI) ? 1 : 0;
 		}
 		
 		if(par->FlatPanel == -1) {
@@ -574,9 +574,9 @@
 		}
 		
 		if (monA) {
-			if (((monA->input == FB_DISP_DDI) &&
+			if (((monA->input & FB_DISP_DDI) &&
 			     par->FlatPanel) ||
-			    ((monA->input != FB_DISP_DDI) &&
+			    ((!(monA->input & FB_DISP_DDI)) &&
 			     !par->FlatPanel)) {
 				if (monB) {
 					fb_destroy_modedb(monB->modedb);
@@ -589,9 +589,9 @@
 		}
 		
 		if (monB) {
-			if (((monB->input == FB_DISP_DDI) &&
+			if (((monB->input & FB_DISP_DDI) &&
 			     !par->FlatPanel) ||
-			    ((monB->input != FB_DISP_DDI) &&
+			    ((!(monB->input & FB_DISP_DDI)) &&
 			     par->FlatPanel)) {
 				fb_destroy_modedb(monB->modedb);
 				monB = NULL;