xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

igfx: use mmio to access registers instead of pio, fix wrong igfxmmio segment size

Browse source 
initially, pio was used to access registers so i didnt need
a kernel driver for initial testing.

pio does not work under efi, so use mmio to access registers.
This commit is contained in:
cinap_lenrek 2015-01-10 03:07:29 +01:00
parent 7c3736a16a
commit 6e67b04a1f
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/pc/vgaigfx.c
View file

@ -25,7 +25,7 @@ igfxenable(VGAscr* scr)
scr->mmio = vmap(p->mem[0].bar&~0x0F, p->mem[0].size); scr->mmio = vmap(p->mem[0].bar&~0x0F, p->mem[0].size);
if(scr->mmio == nil) if(scr->mmio == nil)
return; return;
addvgaseg("igfxmmio", p->mem[0].bar&~0x0F, p->mem[1].size); addvgaseg("igfxmmio", p->mem[0].bar&~0x0F, p->mem[0].size);
if(scr->paddr == 0) if(scr->paddr == 0)
vgalinearpci(scr); vgalinearpci(scr);
if(scr->apsize){ if(scr->apsize){

21
sys/src/cmd/aux/vga/igfx.c
View file

@ -119,6 +119,7 @@ struct Igfx {
Pcidev *pci; Pcidev *pci;
u32int pio; u32int pio;
u32int *mmio;
int type; int type;
@ -157,6 +158,8 @@ rr(Igfx *igfx, u32int a)
if(a == 0) if(a == 0)
return 0; return 0;
assert((a & 3) == 0); assert((a & 3) == 0);
if(igfx->mmio != nil)
return igfx->mmio[a/4];
outportl(igfx->pio, a); outportl(igfx->pio, a);
return inportl(igfx->pio + 4); return inportl(igfx->pio + 4);
} }
@ -165,8 +168,11 @@ wr(Igfx *igfx, u32int a, u32int v)
{ {
if(a == 0) /* invalid */ if(a == 0) /* invalid */
return; return;
assert((a & 3) == 0); assert((a & 3) == 0);
if(igfx->mmio != nil){
igfx->mmio[a/4] = v;
return;
}
outportl(igfx->pio, a); outportl(igfx->pio, a);
outportl(igfx->pio + 4, v); outportl(igfx->pio + 4, v);
} }
@ -319,11 +325,18 @@ snarf(Vga* vga, Ctlr* ctlr)
error("%s: unrecognized device\n", ctlr->name); error("%s: unrecognized device\n", ctlr->name);
return; return;
} }
if((igfx->pci->mem[4].bar & 1) == 0){ vgactlpci(igfx->pci);
if(1){
vgactlw("type", ctlr->name);
igfx->mmio = segattach(0, "igfxmmio", 0, igfx->pci->mem[0].size);
if(igfx->mmio == (u32int*)-1)
error("%s: segattach mmio failed: %r\n", ctlr->name);
} else {
if((igfx->pci->mem[4].bar & 1) == 0)
error("%s: no pio bar\n", ctlr->name); error("%s: no pio bar\n", ctlr->name);
return;
}
igfx->pio = igfx->pci->mem[4].bar & ~1; igfx->pio = igfx->pci->mem[4].bar & ~1;
igfx->mmio = nil;
}
vga->private = igfx; vga->private = igfx;
} }