Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completed MagicMedia 2D acceleration (so NM2200 and all later cards). Please test and provide feedback! 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8504 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen 2004-07-29 13:16:44 +00:00
parent 72c5d34f21
commit 682c6e80ac
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/accelerants/neomagic/GetAccelerantHook.c
View File

@ -216,12 +216,12 @@ status_t check_acc_capability(uint32 feature)
if (si->acc_mode)
{
//fixme: temporary, until acc for these cards is completely setup...
if ((si->ps.card_type >= NM2200) && (feature != B_SCREEN_TO_SCREEN_BLIT))
/* if ((si->ps.card_type >= NM2200) && (feature != B_SCREEN_TO_SCREEN_BLIT))
{
LOG(4, ("Acc: Not exporting hook %s.\n", msg));
return B_ERROR;
}
*/
LOG(4, ("Acc: Exporting hook %s.\n", msg));
return B_OK;
}

56
src/add-ons/accelerants/neomagic/engine/nm_acc.c
View File

@ -4,6 +4,12 @@
Rudolf Cornelissen 3/2004-7/2004.
*/
/*
General note about NeoMagic cards:
The Neomagic acceleration engines apparantly contain several faults which is the
main reason for the differences in setup for different engines.
*/
#define MODULE_BIT 0x00080000
#include "nm_std.h"
@ -19,7 +25,7 @@ invert rectangle
blit
*/
//fixme: acc setup for NM2070, NM2097 and NM2160 only for now...
//fixme: still setup for NM2090 and NM2093 cards...
//fixme: seperate acc routines for different architectures for (marginal) speedup?
status_t nm_acc_wait_idle()
{
@ -256,8 +262,9 @@ status_t nm_acc_setup_rectangle(uint32 color)
// so:
nm_acc_wait_idle();
if (si->ps.card_type == NM2070)
switch (si->ps.card_type)
{
case NM2070:
/* use ROP GXcopy (b16-19), use linear adressing system, do foreground color (b3) */
ACCW(CONTROL, (si->engine.control | 0x000c0008));
/* setup color */
@ -266,13 +273,20 @@ status_t nm_acc_setup_rectangle(uint32 color)
else
/* swap colorbytes */
ACCW(FGCOLOR, (((color & 0xff00) >> 8) | ((color & 0x00ff) << 8)));
}
else
{
break;
case NM2097:
case NM2160:
/* use ROP GXcopy (b16-19), use XY coord. system (b24-25), do foreground color (b3) */
ACCW(CONTROL, (si->engine.control | 0x830c0008));
/* setup color */
ACCW(FGCOLOR, color);
break;
default: /* NM2200 and later */
/* use ROP GXcopy (b16-19), use XY coord. system (b24-25), do foreground color (b3) */
ACCW(CONTROL, (/*si->engine.control |*/ 0x830c0008));
/* setup color */
ACCW(FGCOLOR, color);
break;
}
return B_OK;
@ -293,15 +307,16 @@ status_t nm_acc_rectangle(uint32 xs,uint32 xe,uint32 ys,uint32 yl)
nm_acc_wait_idle();
/* send command and exexute (warning: order of programming regs is important!) */
if (si->ps.card_type == NM2070)
switch (si->ps.card_type)
{
case NM2070:
ACCW(2070_XYEXT, (((yl - 1) << 16) | ((xe - xs - 1) & 0x0000ffff)));
ACCW(2070_DSTSTARTOFF, ((ys * si->fbc.bytes_per_row) + (xs * si->engine.depth)));
}
else
{
break;
default: /* NM2097 and later */
ACCW(2090_DSTSTARTOFF, ((ys << 16) | (xs & 0x0000ffff)));
ACCW(2090_XYEXT, ((yl << 16) | ((xe - xs) & 0x0000ffff)));
break;
}
return B_OK;
@ -316,19 +331,25 @@ status_t nm_acc_setup_rect_invert()
// so:
nm_acc_wait_idle();
if (si->ps.card_type == NM2070)
switch (si->ps.card_type)
{
case NM2070:
/* use ROP GXinvert (b16-19), use linear adressing system. */
/* note:
* although selecting foreground color (b3) should have no influence, NM2070
* thinks otherwise if depth is not 8-bit. In 8-bit depth ROP takes precedence
* over source-select, but in other spaces it's vice-versa (forcing GXcopy!). */
ACCW(CONTROL, (si->engine.control | 0x00050000));
}
else
{
break;
case NM2097:
case NM2160:
/* use ROP GXinvert (b16-19), use XY coord. system (b24-25), do foreground color (b3) */
ACCW(CONTROL, (si->engine.control | 0x83050008));
break;
default: /* NM2200 and later */
/* use ROP GXinvert (b16-19), use XY coord. system (b24-25), do foreground color (b3) */
ACCW(CONTROL, (/*si->engine.control |*/ 0x83050008));
break;
}
/* reset color (just to be 'safe') */
ACCW(FGCOLOR, 0);
@ -349,15 +370,16 @@ status_t nm_acc_rectangle_invert(uint32 xs,uint32 xe,uint32 ys,uint32 yl)
nm_acc_wait_idle();
/* send command and exexute (warning: order of programming regs is important!) */
if (si->ps.card_type == NM2070)
switch (si->ps.card_type)
{
case NM2070:
ACCW(2070_XYEXT, (((yl - 1) << 16) | ((xe - xs - 1) & 0x0000ffff)));
ACCW(2070_DSTSTARTOFF, ((ys * si->fbc.bytes_per_row) + (xs * si->engine.depth)));
}
else
{
break;
default: /* NM2097 and later */
ACCW(2090_DSTSTARTOFF, ((ys << 16) | (xs & 0x0000ffff)));
ACCW(2090_XYEXT, ((yl << 16) | ((xe - xs) & 0x0000ffff)));
break;
}
return B_OK;

4
src/add-ons/accelerants/neomagic/engine/nm_general.c
View File

@ -47,7 +47,7 @@ status_t nm_general_powerup()
{
status_t status;
LOG(1,("POWERUP: Neomagic (open)BeOS Accelerant 0.07 running.\n"));
LOG(1,("POWERUP: Neomagic (open)BeOS Accelerant 0.08 running.\n"));
/* detect card type and power it up */
switch(CFGR(DEVID))
@ -499,7 +499,7 @@ status_t nm_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
*acc_mode = false;
break;
default:
/* NM2230 and later cards support accelerated 24bit modes */
/* NM2230 and later cards do support accelerated 24bit modes */
break;
}