From 742677072fd63eced5ef26aacc7c8e7425bedafc Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sun, 20 Nov 2005 12:10:48 +0000 Subject: [PATCH] panel distinction type logging update: it turns out on 'std' NV11's (at least) this can't be done (card hanging afterwards). No more trouble over here now. Laptop owners are encouraged to run the driver with logging enabled and send me the logfile! NV11 laptop owners please contact me for a recompiled binary to test this: I need info to be able to activate DPMS for laptops... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15038 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/nvidia/engine/nv_info.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_info.c b/src/add-ons/accelerants/nvidia/engine/nv_info.c index 4e8d6a5f18..075817320f 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_info.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_info.c @@ -2466,10 +2466,13 @@ static void detect_panels() LOG(2,("DAC2: PANEL_PWR: $%08x\n", NV_REG32(NV32_2PANEL_PWR))); } - /* determine flatpanel(s) type(s) */ - //fixme?: linux checks only on dualhead cards, and only on DAC1... + /* determine flatpanel type(s) */ + /* note: + * on NV11 accessing registerset(s) hangs card. */ + //fixme: how about NV11's with panels? + //fixme?: linux checks on (only and) all dualhead cards, and only on DAC1... //fixme: testing... - if (1)//si->ps.tmds1_active) + if (/*si->ps.tmds1_active && */(si->ps.card_type != NV11)) { /* Read a indexed register to see if it indicates LVDS or TMDS panel presence. * b0-7 = adress, b16 = 1 = write_enable */ @@ -2481,7 +2484,8 @@ static void detect_panels() LOG(2,("INFO: Flatpanel on head 1 is TMDS type\n")); } //fixme: testing... - if (1)//si->ps.tmds2_active) +// if (si->ps.tmds2_active && (si->ps.card_type != NV11)) + if (si->ps.secondary_head && (si->ps.card_type != NV11)) { /* Read a indexed register to see if it indicates LVDS or TMDS panel presence. * b0-7 = adress, b16 = 1 = write_enable */