i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

back to fine-pitched CRTC granularities: it turns out this isn't the cause of the bandwidth trouble existing on some older cards; lowered flatpanel fixed refresh to be 61Hz instead of 62Hz: some panels are _really_ picky!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8296 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-07-05 07:43:12 +00:00
parent 3f9ae8a3ce
commit e97520124f
4 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_dac.c
+3 -3
View File
@@ -1,6 +1,6 @@
/* program the DAC */ /* program the DAC */
/* Author: /* Author:
Rudolf Cornelissen 12/2003-5/2004 Rudolf Cornelissen 12/2003-7/2004
*/ */
#define MODULE_BIT 0x00010000 #define MODULE_BIT 0x00010000
@@ -143,13 +143,13 @@ status_t nv_dac_set_pix_pll(display_mode target)
float pix_setting, req_pclk; float pix_setting, req_pclk;
status_t result; status_t result;
/* fix a DVI or laptop flatpanel to 62Hz refresh! /* fix a DVI or laptop flatpanel to 61Hz refresh!
* (we can't risk getting below 60.0Hz as some panels shut-off then!) */ * (we can't risk getting below 60.0Hz as some panels shut-off then!) */
/* Note: /* Note:
* The pixelclock drives the flatpanel modeline, not the CRTC modeline. */ * The pixelclock drives the flatpanel modeline, not the CRTC modeline. */
if (si->ps.tmds1_active) if (si->ps.tmds1_active)
{ {
LOG(4,("DAC: Fixing DFP refresh to 62Hz!\n")); LOG(4,("DAC: Fixing DFP refresh to 61Hz!\n"));
/* use the panel's modeline to determine the needed pixelclock */ /* use the panel's modeline to determine the needed pixelclock */
target.timing.pixel_clock = si->ps.p1_timing.pixel_clock; target.timing.pixel_clock = si->ps.p1_timing.pixel_clock;
src/add-ons/accelerants/nvidia/engine/nv_dac2.c
+3 -3
View File
@@ -1,6 +1,6 @@
/* program the secondary DAC */ /* program the secondary DAC */
/* Author: /* Author:
Rudolf Cornelissen 12/2003-5/2004 Rudolf Cornelissen 12/2003-7/2004
*/ */
#define MODULE_BIT 0x00001000 #define MODULE_BIT 0x00001000
@@ -149,13 +149,13 @@ status_t nv_dac2_set_pix_pll(display_mode target)
float pix_setting, req_pclk; float pix_setting, req_pclk;
status_t result; status_t result;
/* fix a DVI or laptop flatpanel to 62Hz refresh! /* fix a DVI or laptop flatpanel to 61Hz refresh!
* (we can't risk getting below 60.0Hz as some panels shut-off then!) */ * (we can't risk getting below 60.0Hz as some panels shut-off then!) */
/* Note: /* Note:
* The pixelclock drives the flatpanel modeline, not the CRTC modeline. */ * The pixelclock drives the flatpanel modeline, not the CRTC modeline. */
if (si->ps.tmds2_active) if (si->ps.tmds2_active)
{ {
LOG(4,("DAC2: Fixing DFP refresh to 62Hz!\n")); LOG(4,("DAC2: Fixing DFP refresh to 61Hz!\n"));
/* use the panel's modeline to determine the needed pixelclock */ /* use the panel's modeline to determine the needed pixelclock */
target.timing.pixel_clock = si->ps.p2_timing.pixel_clock; target.timing.pixel_clock = si->ps.p2_timing.pixel_clock;
src/add-ons/accelerants/nvidia/engine/nv_general.c
+18 -23
View File
@@ -1,7 +1,7 @@
/* Authors: /* Authors:
Mark Watson 12/1999, Mark Watson 12/1999,
Apsed, Apsed,
Rudolf Cornelissen 10/2002-6/2004 Rudolf Cornelissen 10/2002-7/2004
*/ */
#define MODULE_BIT 0x00008000 #define MODULE_BIT 0x00008000
@@ -80,7 +80,7 @@ status_t nv_general_powerup()
{ {
status_t status; status_t status;
LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.17 running.\n")); LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.18 running.\n"));
/* preset no laptop */ /* preset no laptop */
si->ps.laptop = false; si->ps.laptop = false;
@@ -1059,11 +1059,9 @@ static status_t nv_general_bios_to_powergraphics()
* Double-write action needed on those strange NV11 cards: */ * Double-write action needed on those strange NV11 cards: */
/* RESET: don't doublebuffer CRTC access: set programmed values immediately... */ /* RESET: don't doublebuffer CRTC access: set programmed values immediately... */
CRTCW(BUFFER, 0xff); CRTCW(BUFFER, 0xff);
/* ... and don't use fine pitched CRTC granularity on > NV4 cards (b2 = 1) */ /* ... and use fine pitched CRTC granularity on > NV4 cards (b2 = 0) */
/* note: /* note: this has no effect on possible bandwidth issues. */
* the higher-pitched CRTC granularity optimizes use of bandwidth so CRTCW(BUFFER, 0xfb);
* less cards with trouble remain. Confirmed NV15 (GeForce2 Ti500). */
CRTCW(BUFFER, 0xff);
/* select VGA mode (old VGA register) */ /* select VGA mode (old VGA register) */
CRTCW(MODECTL, 0xc3); CRTCW(MODECTL, 0xc3);
/* select graphics mode (old VGA register) */ /* select graphics mode (old VGA register) */
@@ -1095,11 +1093,9 @@ static status_t nv_general_bios_to_powergraphics()
* Double-write action needed on those strange NV11 cards: */ * Double-write action needed on those strange NV11 cards: */
/* RESET: don't doublebuffer CRTC2 access: set programmed values immediately... */ /* RESET: don't doublebuffer CRTC2 access: set programmed values immediately... */
CRTC2W(BUFFER, 0xff); CRTC2W(BUFFER, 0xff);
/* ... and don't use fine pitched CRTC granularity on > NV4 cards (b2 = 1) */ /* ... and use fine pitched CRTC granularity on > NV4 cards (b2 = 0) */
/* note: /* note: this has no effect on possible bandwidth issues. */
* the higher-pitched CRTC granularity optimizes use of bandwidth so CRTC2W(BUFFER, 0xfb);
* less cards with trouble remain. Confirmed NV15 (GeForce2 Ti500). */
CRTC2W(BUFFER, 0xff);
/* select VGA mode (old VGA register) */ /* select VGA mode (old VGA register) */
CRTC2W(MODECTL, 0xc3); CRTC2W(MODECTL, 0xc3);
/* select graphics mode (old VGA register) */ /* select graphics mode (old VGA register) */
@@ -1196,15 +1192,13 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
/* determine pixel multiple based on CRTC memory pitch constraints: /* determine pixel multiple based on CRTC memory pitch constraints:
* -> all NV cards have same granularity constraints on CRTC1 and CRTC2, * -> all NV cards have same granularity constraints on CRTC1 and CRTC2,
* provided that the CRTC1 and CRTC2 BUFFER register b2 = 0; * provided that the CRTC1 and CRTC2 BUFFER register b2 = 0;
* -> we use b2 = 1 because this lowers needed bandwidth on the card. This at
* least reduces distortions on cards that have not too much of it.
* (confirmed NV15: GeForce2 Ti500)
* *
* (Note: Don't mix this up with CRTC timing contraints! Those are * (Note: Don't mix this up with CRTC timing contraints! Those are
* multiples of 8 for horizontal, 1 for vertical timing.) */ * multiples of 8 for horizontal, 1 for vertical timing.) */
switch (si->ps.card_type) switch (si->ps.card_type)
{ {
case NV04: default:
// case NV04:
/* confirmed for: /* confirmed for:
* TNT1 always; * TNT1 always;
* TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200, * TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200,
@@ -1228,11 +1222,11 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
return B_ERROR; return B_ERROR;
} }
break; break;
default: // default:
/* confirmed for: /* confirmed for:
* TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200, * TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200,
* GeForceFX 5200: if the CRTC1 (and CRTC2) BUFFER register b2 = 1 */ * GeForceFX 5200: if the CRTC1 (and CRTC2) BUFFER register b2 = 1 */
switch (target->space) /* switch (target->space)
{ {
case B_CMAP8: crtc_mask = 0x1f; break; case B_CMAP8: crtc_mask = 0x1f; break;
case B_RGB15: crtc_mask = 0x0f; break; case B_RGB15: crtc_mask = 0x0f; break;
@@ -1244,7 +1238,7 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
return B_ERROR; return B_ERROR;
} }
break; break;
} */ }
/* set virtual_width limit for accelerated modes */ /* set virtual_width limit for accelerated modes */
switch (si->ps.card_arch) switch (si->ps.card_arch)
@@ -1301,7 +1295,8 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
/* set virtual_width limit for unaccelerated modes */ /* set virtual_width limit for unaccelerated modes */
switch (si->ps.card_type) switch (si->ps.card_type)
{ {
case NV04: default:
// case NV04:
/* confirmed for: /* confirmed for:
* TNT1 always; * TNT1 always;
* TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200, * TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200,
@@ -1325,11 +1320,11 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
return B_ERROR; return B_ERROR;
} }
break; break;
default: // default:
/* confirmed for: /* confirmed for:
* TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200, * TNT2, TNT2-M64, GeForce2 MX400, GeForce4 MX440, GeForce4 Ti4200,
* GeForceFX 5200: if the CRTC1 (and CRTC2) BUFFER register b2 = 1 */ * GeForceFX 5200: if the CRTC1 (and CRTC2) BUFFER register b2 = 1 */
switch(target->space) /* switch(target->space)
{ {
case B_CMAP8: max_crtc_width = 16352; break; case B_CMAP8: max_crtc_width = 16352; break;
case B_RGB15: max_crtc_width = 8176; break; case B_RGB15: max_crtc_width = 8176; break;
@@ -1341,7 +1336,7 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
return B_ERROR; return B_ERROR;
} }
break; break;
} */ }
/* check for acc capability, and adjust mode to adhere to hardware constraints */ /* check for acc capability, and adjust mode to adhere to hardware constraints */
if (max_acc_width <= max_crtc_width) if (max_acc_width <= max_crtc_width)
src/add-ons/accelerants/nvidia/engine/nv_info.c
+4 -4
View File
@@ -482,10 +482,10 @@ static void detect_panels()
if (DACR(FP_TG_CTRL) & 0x00000001) si->ps.p1_timing.flags |= B_POSITIVE_VSYNC; if (DACR(FP_TG_CTRL) & 0x00000001) si->ps.p1_timing.flags |= B_POSITIVE_VSYNC;
if (DACR(FP_TG_CTRL) & 0x00000010) si->ps.p1_timing.flags |= B_POSITIVE_HSYNC; if (DACR(FP_TG_CTRL) & 0x00000010) si->ps.p1_timing.flags |= B_POSITIVE_HSYNC;
/* refreshrate: /* refreshrate:
* fix a DVI or laptop flatpanel to 62Hz refresh! * fix a DVI or laptop flatpanel to 61Hz refresh!
* (we can't risk getting below 60.0Hz as some panels shut-off then!) */ * (we can't risk getting below 60.0Hz as some panels shut-off then!) */
si->ps.p1_timing.pixel_clock = si->ps.p1_timing.pixel_clock =
(si->ps.p1_timing.h_total * si->ps.p1_timing.v_total * 62) / 1000; (si->ps.p1_timing.h_total * si->ps.p1_timing.v_total * 61) / 1000;
} }
if (si->ps.tmds2_active) if (si->ps.tmds2_active)
{ {
@@ -505,10 +505,10 @@ static void detect_panels()
if (DAC2R(FP_TG_CTRL) & 0x00000001) si->ps.p2_timing.flags |= B_POSITIVE_VSYNC; if (DAC2R(FP_TG_CTRL) & 0x00000001) si->ps.p2_timing.flags |= B_POSITIVE_VSYNC;
if (DAC2R(FP_TG_CTRL) & 0x00000010) si->ps.p2_timing.flags |= B_POSITIVE_HSYNC; if (DAC2R(FP_TG_CTRL) & 0x00000010) si->ps.p2_timing.flags |= B_POSITIVE_HSYNC;
/* refreshrate: /* refreshrate:
* fix a DVI or laptop flatpanel to 62Hz refresh! * fix a DVI or laptop flatpanel to 61Hz refresh!
* (we can't risk getting below 60.0Hz as some panels shut-off then!) */ * (we can't risk getting below 60.0Hz as some panels shut-off then!) */
si->ps.p2_timing.pixel_clock = si->ps.p2_timing.pixel_clock =
(si->ps.p2_timing.h_total * si->ps.p2_timing.v_total * 62) / 1000; (si->ps.p2_timing.h_total * si->ps.p2_timing.v_total * 61) / 1000;
} }
/* dump some panel configuration registers... */ /* dump some panel configuration registers... */