From 19a34ea09cd13d86fc5a7eb499e61ac190db7bc9 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sun, 6 Sep 2009 14:42:11 +0000 Subject: [PATCH] added disabling of spread spectrum-ing DAC clocks on NV30 and later: my laptop display nolonger shivers on the secondary output. version is 1.03. +alphabranch. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32965 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/nvidia/nv_macros.h | 1 + src/add-ons/accelerants/nvidia/engine/nv_dac.c | 18 ++++++++++++++---- .../accelerants/nvidia/engine/nv_dac2.c | 18 ++++++++++++++---- .../accelerants/nvidia/engine/nv_general.c | 2 +- .../kernel/drivers/graphics/nvidia/UPDATE.html | 5 +++-- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/headers/private/graphics/nvidia/nv_macros.h b/headers/private/graphics/nvidia/nv_macros.h index 40af20ccd3..590c9ec2a3 100644 --- a/headers/private/graphics/nvidia/nv_macros.h +++ b/headers/private/graphics/nvidia/nv_macros.h @@ -649,6 +649,7 @@ #define NVDAC_NV10_CURSYNC 0x00680404 #define NVDAC_PIXPLLC 0x00680508 #define NVDAC_PLLSEL 0x0068050c +#define NVDAC_NV30_PLLSETUP 0x00680524 #define NVDAC_OUTPUT 0x0068052c #define NVDAC_PIXPLLC2 0x00680578 #define NVDAC_NV40_PLLSEL2 0x00680580 diff --git a/src/add-ons/accelerants/nvidia/engine/nv_dac.c b/src/add-ons/accelerants/nvidia/engine/nv_dac.c index 5ed15e2c4e..11f75c2107 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_dac.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_dac.c @@ -168,14 +168,24 @@ status_t nv_dac_set_pix_pll(display_mode target) /* signal that we actually want to set the mode */ result = nv_dac_pix_pll_find(target,&pix_setting,&m,&n,&p, 1); - if (result != B_OK) - { - return result; - } + if (result != B_OK) return result; /* dump old setup for learning purposes */ nv_dac_dump_pix_pll(); + /* some logging for learning purposes */ + LOG(4,("DAC: current NV30_PLLSETUP settings: $%08x\n", DACR(NV30_PLLSETUP))); + /* this register seems to (dis)connect functions blocks and PLLs: + * there seem to be two PLL types per function block (on some cards), + * b16-17 DAC1clk, b18-19 DAC2clk, b20-21 GPUclk, b22-23 MEMclk. */ + LOG(4,("DAC: current (0x0000c040) settings: $%08x\n", NV_REG32(0x0000c040))); + + /* disable spread spectrum modes for the pixelPLLs _first_ */ + /* spread spectrum: b0,1 = GPUclk, b2,3 = MEMclk, b4,5 = DAC1clk, b6,7 = DAC2clk; + * b16-19 influence clock routing to digital outputs (internal/external LVDS transmitters?) */ + if (si->ps.card_arch >= NV30A) + DACW(NV30_PLLSETUP, (DACR(NV30_PLLSETUP) & ~0x000000f0)); + /* we offer this option because some panels have very tight restrictions, * and there's no overlapping settings range that makes them all work. * note: diff --git a/src/add-ons/accelerants/nvidia/engine/nv_dac2.c b/src/add-ons/accelerants/nvidia/engine/nv_dac2.c index babecb3caa..5a1138cff0 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_dac2.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_dac2.c @@ -171,14 +171,24 @@ status_t nv_dac2_set_pix_pll(display_mode target) /* signal that we actually want to set the mode */ result = nv_dac2_pix_pll_find(target,&pix_setting,&m,&n,&p, 1); - if (result != B_OK) - { - return result; - } + if (result != B_OK) return result; /* dump old setup for learning purposes */ nv_dac2_dump_pix_pll(); + /* some logging for learning purposes */ + LOG(4,("DAC2: current NV30_PLLSETUP settings: $%08x\n", DACR(NV30_PLLSETUP))); + /* this register seems to (dis)connect functions blocks and PLLs: + * there seem to be two PLL types per function block (on some cards), + * b16-17 DAC1clk, b18-19 DAC2clk, b20-21 GPUclk, b22-23 MEMclk. */ + LOG(4,("DAC2: current (0x0000c040) settings: $%08x\n", NV_REG32(0x0000c040))); + + /* disable spread spectrum modes for the pixelPLLs _first_ */ + /* spread spectrum: b0,1 = GPUclk, b2,3 = MEMclk, b4,5 = DAC1clk, b6,7 = DAC2clk; + * b16-19 influence clock routing to digital outputs (internal/external LVDS transmitters?) */ + if (si->ps.card_arch >= NV30A) + DACW(NV30_PLLSETUP, (DACR(NV30_PLLSETUP) & ~0x000000f0)); + /* we offer this option because some panels have very tight restrictions, * and there's no overlapping settings range that makes them all work. * note: diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c index ab4c481207..f95bc29d5f 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_general.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c @@ -92,7 +92,7 @@ status_t nv_general_powerup() { status_t status; - LOG(1,("POWERUP: Haiku nVidia Accelerant 1.02 running.\n")); + LOG(1,("POWERUP: Haiku nVidia Accelerant 1.03 running.\n")); /* log VBLANK INT usability status */ if (si->ps.int_assigned) diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html index 85ae3a6b12..1ee09a159b 100644 --- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html +++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html @@ -4,7 +4,7 @@

Changes done for each driverversion:

-

head (SVN 1.01, Rudolf)

+

head (SVN 1.03, Rudolf)

nv_driver 0.80 (Rudolf)