summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-06-29 15:56:23 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-06-29 15:56:23 +0000
commit270f5269a08da8ed0186e8a2223b673e0433a771 (patch)
tree80b15741d8618690b70d9de54d911a29beeef4b3
parentbf73c0716e9e4be0540d2ee7340bd5833831a434 (diff)
Bugzilla #3657 <https://bugs.freedesktop.org/show_bug.cgi?id=3657> Patch
#2992 <https://bugs.freedesktop.org/attachment.cgi?id=2992> Experimental DPMS support for GeForce4 and later laptops. (Mark Vojkovich)
-rw-r--r--src/nv_driver.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index c4449c6..54c4305 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -25,7 +25,7 @@
/* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen
<jpaana@s2.org> */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.133 2005/04/16 23:57:26 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.134 2005/04/24 18:57:35 mvojkovi Exp $ */
#include "nv_include.h"
@@ -1706,8 +1706,6 @@ NVRestore(ScrnInfoPtr pScrn)
static void NVBacklightEnable(NVPtr pNv, Bool on)
{
- CARD32 fpcontrol;
-
/* This is done differently on each laptop. Here we
define the ones we know for sure. */
@@ -1729,7 +1727,13 @@ static void NVBacklightEnable(NVPtr pNv, Bool on)
}
#endif
- if(!pNv->LVDS) {
+ if(pNv->LVDS) {
+ if(pNv->twoHeads && ((pNv->Chipset & 0x0ff0) != 0x0110)) {
+ pNv->PMC[0x130C/4] = on ? 3 : 7;
+ }
+ } else {
+ CARD32 fpcontrol;
+
fpcontrol = pNv->PRAMDAC[0x0848/4] & 0xCfffffCC;
/* cut the TMDS output */