diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-01-16 13:38:52 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-01-16 13:38:52 +0100 |
| commit | 22d15f98bae52f140846734cdd4667c5ea26d510 (patch) | |
| tree | 54208ff64eddc9c9c8ee2c81615357ce84f6d2db /sys/src/cmd | |
| parent | 5e50b13d3422c5c6b55b82602c20555807599b88 (diff) | |
igfx: determine amount of preallocated stolen graphics memory for hw cursor
allocate the hardware cursor plane at the end of
preallocated stolen graphics memory.
Diffstat (limited to 'sys/src/cmd')
| -rw-r--r-- | sys/src/cmd/aux/vga/igfx.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/src/cmd/aux/vga/igfx.c b/sys/src/cmd/aux/vga/igfx.c index dd6f9aa8c..d1e5b15ef 100644 --- a/sys/src/cmd/aux/vga/igfx.c +++ b/sys/src/cmd/aux/vga/igfx.c @@ -251,7 +251,7 @@ snarfpipe(Igfx *igfx, int x) p = &igfx->pipe[x]; - o = 0x60000 | x*0x1000; + o = 0x60000 + x*0x1000; snarftrans(igfx, p, o); p->src = snarfreg(igfx, o + 0x0001C); @@ -278,26 +278,26 @@ snarfpipe(Igfx *igfx, int x) } /* display plane */ - p->dsp->cntr = snarfreg(igfx, 0x70180 | x*0x1000); - p->dsp->linoff = snarfreg(igfx, 0x70184 | x*0x1000); - p->dsp->stride = snarfreg(igfx, 0x70188 | x*0x1000); - p->dsp->tileoff = snarfreg(igfx, 0x701A4 | x*0x1000); - p->dsp->surf = snarfreg(igfx, 0x7019C | x*0x1000); + p->dsp->cntr = snarfreg(igfx, 0x70180 + x*0x1000); + p->dsp->linoff = snarfreg(igfx, 0x70184 + x*0x1000); + p->dsp->stride = snarfreg(igfx, 0x70188 + x*0x1000); + p->dsp->tileoff = snarfreg(igfx, 0x701A4 + x*0x1000); + p->dsp->surf = snarfreg(igfx, 0x7019C + x*0x1000); /* cursor plane */ switch(igfx->type){ case TypeIVB: - p->cur->cntr = snarfreg(igfx, 0x70080 | x*0x1000); - p->cur->base = snarfreg(igfx, 0x70084 | x*0x1000); - p->cur->pos = snarfreg(igfx, 0x70088 | x*0x1000); + p->cur->cntr = snarfreg(igfx, 0x70080 + x*0x1000); + p->cur->base = snarfreg(igfx, 0x70084 + x*0x1000); + p->cur->pos = snarfreg(igfx, 0x70088 + x*0x1000); break; case TypeG45: - p->dsp->pos = snarfreg(igfx, 0x7018C | x*0x1000); - p->dsp->size = snarfreg(igfx, 0x70190 | x*0x1000); + p->dsp->pos = snarfreg(igfx, 0x7018C + x*0x1000); + p->dsp->size = snarfreg(igfx, 0x70190 + x*0x1000); - p->cur->cntr = snarfreg(igfx, 0x70080 | x*0x40); - p->cur->base = snarfreg(igfx, 0x70084 | x*0x40); - p->cur->pos = snarfreg(igfx, 0x7008C | x*0x40); + p->cur->cntr = snarfreg(igfx, 0x70080 + x*0x40); + p->cur->base = snarfreg(igfx, 0x70084 + x*0x40); + p->cur->pos = snarfreg(igfx, 0x7008C + x*0x40); break; } } |