From 3ab7752ce8f0b3f1981fc1d20cc692d973b80835 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sun, 30 Aug 2009 19:54:25 +0000 Subject: [PATCH] fixed use of EDID info for at least the internal panel on NV34, geforce FX 5200 laptops. +alphabranch git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32840 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/nvidia/engine/nv_i2c.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_i2c.c b/src/add-ons/accelerants/nvidia/engine/nv_i2c.c index 0120b2063f..362f7ea612 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_i2c.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_i2c.c @@ -690,6 +690,8 @@ i2c_DumpSpecsEDID(edid_specs* specs) * not depend on the way screens are connected to the cards (DVI/VGA, 1 or 2 screens). * - on some NV40 architecture cards i2c bus2 connects to con2 instead of i2c bus0. This * is confirmed on GeForce FX 6600 (NV43, id 0x0141) and GeForce 7300 (G72, id 0x01d1). + * - on pre-NV40 laptops i2c bus2 can connect to con2 as well: confirmed on a Geforce FX + * 5200 Go (NV34, id 0x0324). * - con1 has CRTC1 and DAC1, and con2 has CRTC2 and DAC2 if nv_general_output_select() * is set to 'straight' and there are only VGA type screens connected. */ void i2c_DetectScreens(void) @@ -749,7 +751,11 @@ void i2c_DetectScreens(void) } break; default: - LOG(4,("I2C: DetectScreens: WARNING, unexpected behaviour detected!\n")); + if (!si->ps.con2_screen.have_native_edid && si->ps.laptop) { + i2c_ExtractSpecsEDID(&edid, &si->ps.con2_screen); + } else { + LOG(4,("I2C: DetectScreens: WARNING, unexpected behaviour detected!\n")); + } break; } }