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

updated mode granularity checking / max virtual size limiting for dualhead cards

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6330 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-01-26 15:06:35 +00:00
parent c10586fe0d
commit 4b47486ee5
4 changed files with 168 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_dac.c
+5 -5
View File
@@ -102,7 +102,7 @@ status_t nv_dac_set_pix_pll(display_mode target)
{ {
return result; return result;
} }
/*reprogram (disable,select,wait for stability,enable)*/ /*reprogram (disable,select,wait for stability,enable)*/
// DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0F)|0x04); /*disable the PIXPLL*/ // DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0F)|0x04); /*disable the PIXPLL*/
// DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0C)|0x01); /*select the PIXPLL*/ // DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0C)|0x01); /*select the PIXPLL*/
@@ -110,7 +110,7 @@ status_t nv_dac_set_pix_pll(display_mode target)
/* program new frequency */ /* program new frequency */
DACW(PIXPLLC, ((p << 16) | (n << 8) | m)); DACW(PIXPLLC, ((p << 16) | (n << 8) | m));
/* program MSByte N and M scalers if they exist (b31=1 enables them) */ /* program 2nd set N and M scalers if they exist (b31=1 enables them) */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36))
DACW(PIXPLLC2, 0x80000401); DACW(PIXPLLC2, 0x80000401);
@@ -227,7 +227,7 @@ static status_t nv4_nv10_nv20_dac_pix_pll_find(
/* check if this is within range of the VCO specs */ /* check if this is within range of the VCO specs */
if ((f_vco >= si->ps.min_pixel_vco) && (f_vco <= si->ps.max_pixel_vco)) if ((f_vco >= si->ps.min_pixel_vco) && (f_vco <= si->ps.max_pixel_vco))
{ {
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco /= 4; if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco /= 4;
/* iterate trough all valid reference-frequency postscaler settings */ /* iterate trough all valid reference-frequency postscaler settings */
@@ -245,7 +245,7 @@ static status_t nv4_nv10_nv20_dac_pix_pll_find(
/* find error in frequency this setting gives */ /* find error in frequency this setting gives */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36))
{ {
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
error = fabs((req_pclk / 4) - (((si->ps.f_ref / m) * n) / p)); error = fabs((req_pclk / 4) - (((si->ps.f_ref / m) * n) / p));
} }
else else
@@ -270,7 +270,7 @@ static status_t nv4_nv10_nv20_dac_pix_pll_find(
/* log the VCO frequency found */ /* log the VCO frequency found */
f_vco = ((si->ps.f_ref / m) * n); f_vco = ((si->ps.f_ref / m) * n);
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco *= 4; if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco *= 4;
LOG(2,("DAC: pix VCO frequency found %fMhz\n", f_vco)); LOG(2,("DAC: pix VCO frequency found %fMhz\n", f_vco));
src/add-ons/accelerants/nvidia/engine/nv_dac2.c
+4 -4
View File
@@ -108,7 +108,7 @@ status_t nv_dac2_set_pix_pll(display_mode target)
/* program new frequency */ /* program new frequency */
DAC2W(PIXPLLC, ((p << 16) | (n << 8) | m)); DAC2W(PIXPLLC, ((p << 16) | (n << 8) | m));
/* program MSByte N and M scalers if they exist (b31=1 enables them) */ /* program 2nd set N and M scalers if they exist (b31=1 enables them) */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36))
DAC2W(PIXPLLC2, 0x80000401); DAC2W(PIXPLLC2, 0x80000401);
@@ -225,7 +225,7 @@ static status_t nv10_nv20_dac2_pix_pll_find(
/* check if this is within range of the VCO specs */ /* check if this is within range of the VCO specs */
if ((f_vco >= si->ps.min_video_vco) && (f_vco <= si->ps.max_video_vco)) if ((f_vco >= si->ps.min_video_vco) && (f_vco <= si->ps.max_video_vco))
{ {
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco /= 4; if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco /= 4;
/* iterate trough all valid reference-frequency postscaler settings */ /* iterate trough all valid reference-frequency postscaler settings */
@@ -242,7 +242,7 @@ static status_t nv10_nv20_dac2_pix_pll_find(
/* find error in frequency this setting gives */ /* find error in frequency this setting gives */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36))
{ {
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
error = fabs((req_pclk / 4) - (((si->ps.f_ref / m) * n) / p)); error = fabs((req_pclk / 4) - (((si->ps.f_ref / m) * n) / p));
} }
else else
@@ -267,7 +267,7 @@ static status_t nv10_nv20_dac2_pix_pll_find(
/* log the VCO frequency found */ /* log the VCO frequency found */
f_vco = ((si->ps.f_ref / m) * n); f_vco = ((si->ps.f_ref / m) * n);
/* FX5600 and FX5700 tweak for MSbytes N and M scalers */ /* FX5600 and FX5700 tweak for 2nd set N and M scalers */
if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco *= 4; if ((si->ps.card_type == NV31) || (si->ps.card_type == NV36)) f_vco *= 4;
LOG(2,("DAC2: pix VCO frequency found %fMhz\n", f_vco)); LOG(2,("DAC2: pix VCO frequency found %fMhz\n", f_vco));
src/add-ons/accelerants/nvidia/engine/nv_general.c
+156 -106
View File
@@ -80,7 +80,7 @@ status_t nv_general_powerup()
{ {
status_t status; status_t status;
LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.08-6 running.\n")); LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.08-7 running.\n"));
/* preset no laptop */ /* preset no laptop */
si->ps.laptop = false; si->ps.laptop = false;
@@ -1005,22 +1005,16 @@ status_t nv_general_bios_to_powergraphics()
/* Check if mode virtual_size adheres to the cards _maximum_ contraints, and modify /* Check if mode virtual_size adheres to the cards _maximum_ contraints, and modify
* virtual_size to the nearest valid maximum for the mode on the card if not so. * virtual_size to the nearest valid maximum for the mode on the card if not so.
* Then: check if virtual_width adheres to the cards _multiple_ constraints, and * Also: check if virtual_width adheres to the cards granularity constraints, and
* create mode slopspace if not so. * create mode slopspace if not so.
* We use acc multiple constraints here if we expect we can use acceleration, because * We use acc or crtc granularity constraints based on the 'worst case' scenario.
* acc constraints are worse than CRTC constraints.
* *
* Mode slopspace is reflected in fbc->bytes_per_row BTW. */ * Mode slopspace is reflected in fbc->bytes_per_row BTW. */
//fixme: seperate heads for real dualhead modes:
//CRTC1 and 2 constraints differ!
status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_row, bool *acc_mode) status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_row, bool *acc_mode)
{ {
/* Note:
* This routine assumes that the CRTC memory pitch granularity is 'smaller than',
* or 'equals' the acceleration engine memory pitch granularity! */
uint32 video_pitch; uint32 video_pitch;
uint32 acc_mask, crtc_mask; uint32 acc_mask, crtc_mask;
uint32 max_crtc_width, max_acc_width;
uint8 depth = 8; uint8 depth = 8;
/* determine pixel multiple based on 2D/3D engine constraints */ /* determine pixel multiple based on 2D/3D engine constraints */
@@ -1060,13 +1054,37 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
break; break;
} }
/* determine pixel multiple based on CRTC memory pitch constraints. /* determine pixel multiple based on CRTC memory pitch constraints:
* -> all NV cards have same constraints on CRTC1 and CRTC2;
* -> if CRTC1 and CRTC2 are adressed in combined mode (OWNER = $04),
* dualhead cards have the same CRTC granularity as singlehead cards;
* -> if CRTC1 and CRTC2 are adressed seperately (OWNER is $00 or $03),
* dualhead cards have bigger granularity than singlehead cards: this
* mode is used on dualhead cards with this driver.
*
* (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_arch) if (si->ps.secondary_head)
{ {
default: /* confirmed for:
/* all NV cards */ * GeForceFX 5200 */
// fixme: still confirm for GeForce2 MX400, GeForce4 MX440, GeForceFX 5600...
switch (target->space)
{
case B_CMAP8: crtc_mask = 0x1f; break;
case B_RGB15: crtc_mask = 0x0f; break;
case B_RGB16: crtc_mask = 0x0f; break;
case B_RGB24: crtc_mask = 0x1f; break;
case B_RGB32: crtc_mask = 0x07; break;
default:
LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
return B_ERROR;
}
}
else /* singlehead cards */
{
/* confirmed for:
* TNT1, TNT2, TNT2-M64 */
switch (target->space) switch (target->space)
{ {
case B_CMAP8: crtc_mask = 0x07; break; case B_CMAP8: crtc_mask = 0x07; break;
@@ -1078,29 +1096,9 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
LOG(8,("INIT: unknown color space: 0x%08x\n", target->space)); LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
return B_ERROR; return B_ERROR;
} }
//fixme for NV..
/* see G400 specs: CRTC2 has different constraints */
/* Note:
* set for RGB and B_YCbCr422 modes. Other modes need larger multiples! */
if (target->flags & DUALHEAD_BITS)
{
switch (target->space)
{
case B_RGB16: crtc_mask = 0x1f; break;
case B_RGB32: crtc_mask = 0x0f; break;
default:
LOG(8,("INIT: illegal DH color space: 0x%08x\n", target->space));
return B_ERROR;
}
}
//end fixme.
break;
} }
/* check if we can setup this mode with acceleration: /* set virtual_width limit for accelerated modes */
* Max sizes need to adhere to both the acceleration engine _and_ the CRTC constraints! */
*acc_mode = true;
/* check virtual_width */
switch (si->ps.card_arch) switch (si->ps.card_arch)
{ {
case NV04A: case NV04A:
@@ -1108,19 +1106,14 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
* TNT1, TNT2, TNT2-M64 */ * TNT1, TNT2, TNT2-M64 */
switch(target->space) switch(target->space)
{ {
case B_CMAP8: case B_CMAP8: max_acc_width = 8176; break;
if (target->virtual_width > 8176) *acc_mode = false; case B_RGB15: max_acc_width = 4088; break;
break; case B_RGB16: max_acc_width = 4088; break;
case B_RGB15_LITTLE: case B_RGB24: max_acc_width = 2720; break;
case B_RGB16_LITTLE: case B_RGB32: max_acc_width = 2044; break;
if (target->virtual_width > 4088) *acc_mode = false; default:
break; LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
case B_RGB24_LITTLE: return B_ERROR;
if (target->virtual_width > 2720) *acc_mode = false;
break;
case B_RGB32_LITTLE:
if (target->virtual_width > 2044) *acc_mode = false;
break;
} }
break; break;
default: default:
@@ -1128,19 +1121,14 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
* GeForce2 MX400, GeForce4 MX440, GeForceFX 5200 */ * GeForce2 MX400, GeForce4 MX440, GeForceFX 5200 */
switch(target->space) switch(target->space)
{ {
case B_CMAP8: case B_CMAP8: max_acc_width = 16368; break;
if (target->virtual_width > 16368) *acc_mode = false; case B_RGB15: max_acc_width = 8184; break;
break; case B_RGB16: max_acc_width = 8184; break;
case B_RGB15_LITTLE: case B_RGB24: max_acc_width = 5456; break;
case B_RGB16_LITTLE: case B_RGB32: max_acc_width = 4092; break;
if (target->virtual_width > 8184) *acc_mode = false; default:
break; LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
case B_RGB24_LITTLE: return B_ERROR;
if (target->virtual_width > 5456) *acc_mode = false;
break;
case B_RGB32_LITTLE:
if (target->virtual_width > 4092) *acc_mode = false;
break;
} }
/* NV31 (confirmed GeForceFX 5600) has NV20A granularity! /* NV31 (confirmed GeForceFX 5600) has NV20A granularity!
* So let it fall through... */ * So let it fall through... */
@@ -1150,65 +1138,127 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
* GeForce4 Ti4200 */ * GeForce4 Ti4200 */
switch(target->space) switch(target->space)
{ {
case B_CMAP8: case B_CMAP8: max_acc_width = 16320; break;
if (target->virtual_width > 16320) *acc_mode = false; case B_RGB15: max_acc_width = 8160; break;
break; case B_RGB16: max_acc_width = 8160; break;
case B_RGB15_LITTLE: case B_RGB24: max_acc_width = 5440; break;
case B_RGB16_LITTLE: case B_RGB32: max_acc_width = 4080; break;
if (target->virtual_width > 8160) *acc_mode = false; default:
break; LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
case B_RGB24_LITTLE: return B_ERROR;
if (target->virtual_width > 5440) *acc_mode = false;
break;
case B_RGB32_LITTLE:
if (target->virtual_width > 4080) *acc_mode = false;
break;
} }
break; break;
} }
/* virtual_height */
/* (NV cards can even do more than this(?)...
* but 4096 is confirmed on all cards at max. accelerated width.) */
if (target->virtual_height > 4096) *acc_mode = false;
/* now check NV virtual_size based on CRTC constraints */ /* set virtual_width limit for unaccelerated modes */
if (si->ps.secondary_head)
{ {
/* virtual_width */ /* confirmed for:
//fixme for NV CRTC2?...: * GeForceFX 5200 */
// fixme: still confirm for GeForce2 MX400, GeForce4 MX440, GeForceFX 5600...
switch(target->space) switch(target->space)
{ {
case B_CMAP8: case B_CMAP8: max_crtc_width = 16352; break;
if (target->virtual_width > 16376) case B_RGB15: max_crtc_width = 8176; break;
target->virtual_width = 16376; case B_RGB16: max_crtc_width = 8176; break;
break; case B_RGB24: max_crtc_width = 5440; break;
case B_RGB15_LITTLE: case B_RGB32: max_crtc_width = 4088; break;
case B_RGB16_LITTLE: default:
if (target->virtual_width > 8188) LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
target->virtual_width = 8188; return B_ERROR;
break;
case B_RGB24_LITTLE:
if (target->virtual_width > 5456)
target->virtual_width = 5456;
break;
case B_RGB32_LITTLE:
if (target->virtual_width > 4094)
target->virtual_width = 4094;
break;
} }
}
else /* singlehead cards */
{
/* confirmed for:
* TNT1, TNT2, TNT2-M64 */
switch(target->space)
{
case B_CMAP8: max_crtc_width = 16376; break;
case B_RGB15: max_crtc_width = 8188; break;
case B_RGB16: max_crtc_width = 8188; break;
case B_RGB24: max_crtc_width = 5456; break;
case B_RGB32: max_crtc_width = 4094; break;
default:
LOG(8,("INIT: unknown color space: 0x%08x\n", target->space));
return B_ERROR;
}
}
/* check for acc capability, and adjust mode to adhere to hardware constraints */
if (max_acc_width <= max_crtc_width)
{
/* check if we can setup this mode with acceleration */
*acc_mode = true;
/* virtual_width */
if (target->virtual_width > max_acc_width) *acc_mode = false;
/* virtual_height */
/* (NV cards can even do more than this(?)...
* but 4096 is confirmed on all cards at max. accelerated width.) */
if (target->virtual_height > 4096) *acc_mode = false;
/* now check virtual_size based on CRTC constraints */
if (target->virtual_width > max_crtc_width) target->virtual_width = max_crtc_width;
/* virtual_height: The only constraint here is the cards memory size which is /* virtual_height: The only constraint here is the cards memory size which is
* checked later on in ProposeMode: virtual_height is adjusted then if needed. * checked later on in ProposeMode: virtual_height is adjusted then if needed.
* 'Limiting here' to the variable size that's at least available (uint16). */ * 'Limiting here' to the variable size that's at least available (uint16). */
if (target->virtual_height > 65535) target->virtual_height = 65535; if (target->virtual_height > 65535) target->virtual_height = 65535;
}
/* OK, now we know that virtual_width is valid, and it's needing no slopspace if /* OK, now we know that virtual_width is valid, and it's needing no slopspace if
* it was confined above, so we can finally calculate safely if we need slopspace * it was confined above, so we can finally calculate safely if we need slopspace
* for this mode... */ * for this mode... */
if (*acc_mode) if (*acc_mode)
video_pitch = ((target->virtual_width + acc_mask) & ~acc_mask); {
else /* the mode needs to adhere to the largest granularity imposed... */
video_pitch = ((target->virtual_width + crtc_mask) & ~crtc_mask); if (acc_mask < crtc_mask)
video_pitch = ((target->virtual_width + crtc_mask) & ~crtc_mask);
else
video_pitch = ((target->virtual_width + acc_mask) & ~acc_mask);
}
else /* unaccelerated mode */
video_pitch = ((target->virtual_width + crtc_mask) & ~crtc_mask);
}
else /* max_acc_width > max_crtc_width */
{
/* check if we can setup this mode with acceleration */
*acc_mode = true;
/* (we already know virtual_width will be no problem) */
/* virtual_height */
/* (NV cards can even do more than this(?)...
* but 4096 is confirmed on all cards at max. accelerated width.) */
if (target->virtual_height > 4096) *acc_mode = false;
/* now check virtual_size based on CRTC constraints */
if (*acc_mode)
{
/* note that max_crtc_width already adheres to crtc_mask */
if (target->virtual_width > (max_crtc_width & ~acc_mask))
target->virtual_width = (max_crtc_width & ~acc_mask);
}
else /* unaccelerated mode */
{
if (target->virtual_width > max_crtc_width)
target->virtual_width = max_crtc_width;
}
/* virtual_height: The only constraint here is the cards memory size which is
* checked later on in ProposeMode: virtual_height is adjusted then if needed.
* 'Limiting here' to the variable size that's at least available (uint16). */
if (target->virtual_height > 65535) target->virtual_height = 65535;
/* OK, now we know that virtual_width is valid, and it's needing no slopspace if
* it was confined above, so we can finally calculate safely if we need slopspace
* for this mode... */
if (*acc_mode)
{
/* the mode needs to adhere to the largest granularity imposed... */
if (acc_mask < crtc_mask)
video_pitch = ((target->virtual_width + crtc_mask) & ~crtc_mask);
else
video_pitch = ((target->virtual_width + acc_mask) & ~acc_mask);
}
else /* unaccelerated mode */
video_pitch = ((target->virtual_width + crtc_mask) & ~crtc_mask);
}
LOG(2,("INIT: memory pitch will be set to %d pixels for colorspace 0x%08x\n", LOG(2,("INIT: memory pitch will be set to %d pixels for colorspace 0x%08x\n",
video_pitch, target->space)); video_pitch, target->space));
src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
+3 -2
View File
@@ -4,7 +4,7 @@
</head> </head>
<body> <body>
<p><h2>Changes done for each driverversion:</h2></p> <p><h2>Changes done for each driverversion:</h2></p>
<p><h1>head (0.08-6, Rudolf)</h1></p> <p><h1>head (0.08-7, Rudolf)</h1></p>
<ul> <ul>
<li>Fixed GeForceFX 5600 and FX 5700 monitor 'refresh out of range' / shutoff fault. nVidia changed the pixelPLL for the NV31 and NV36; <li>Fixed GeForceFX 5600 and FX 5700 monitor 'refresh out of range' / shutoff fault. nVidia changed the pixelPLL for the NV31 and NV36;
<li>Fixed acceleration engine restrictions code to adhere to GeForceFX 5600 restrictions: those are still NV20 style for this card; <li>Fixed acceleration engine restrictions code to adhere to GeForceFX 5600 restrictions: those are still NV20 style for this card;
@@ -16,7 +16,8 @@
<li>Added card recognition for GeForceFX 5700, FX 5950 and some other (older) cards; <li>Added card recognition for GeForceFX 5700, FX 5950 and some other (older) cards;
<li>Added 256Mb RAM detection; <li>Added 256Mb RAM detection;
<li>Improved startup code: this should (could) fix random trouble on some cards like for instance hardcursor trouble on especially laptops; <li>Improved startup code: this should (could) fix random trouble on some cards like for instance hardcursor trouble on especially laptops;
<li>Added dualhead support (use Mark Watson's 'G400 Dualhead Setup' from BeBits for now): Note that dualhead switch mode still has to be setup, and overlay is fixed to the primary head for now. <li>Added dualhead support (use Mark Watson's 'G400 Dualhead Setup' from BeBits for now): Note that dualhead switch mode still has to be setup, and overlay is fixed to the primary head for now;
<li>Updated mode granularity and max virtual size checking/limiting to adhere to new CRTC setup for dualhead cards.
</ul> </ul>
<p><h1>nv_driver 0.07 (Rudolf)</h1></p> <p><h1>nv_driver 0.07 (Rudolf)</h1></p>
<ul> <ul>