geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust the types of the fields of xgi_aperture.

main
Ian Romanick 2007-07-09 16:07:27 -07:00
parent 2f2d8b9688
commit a3f56dc3d0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-core/xgi_drv.c
View File

@ -252,8 +252,7 @@ int xgi_kern_probe(struct pci_dev *dev, const struct pci_device_id *id_table)
XGI_INFO("info->mmio.base: 0x%lx \n", info->mmio.base); XGI_INFO("info->mmio.base: 0x%lx \n", info->mmio.base);
XGI_INFO("info->mmio.size: 0x%lx \n", info->mmio.size); XGI_INFO("info->mmio.size: 0x%lx \n", info->mmio.size);
info->mmio.vbase = (unsigned char *)ioremap_nocache(info->mmio.base, info->mmio.vbase = ioremap_nocache(info->mmio.base, info->mmio.size);
info->mmio.size);
if (!info->mmio.vbase) { if (!info->mmio.vbase) {
release_mem_region(info->mmio.base, info->mmio.size); release_mem_region(info->mmio.base, info->mmio.size);
XGI_ERROR("info->mmio.vbase failed\n"); XGI_ERROR("info->mmio.vbase failed\n");
@ -282,8 +281,7 @@ int xgi_kern_probe(struct pci_dev *dev, const struct pci_device_id *id_table)
goto error_disable_dev; goto error_disable_dev;
} }
info->fb.vbase = (unsigned char *)ioremap_nocache(info->fb.base, info->fb.vbase = ioremap_nocache(info->fb.base, info->fb.size);
info->fb.size);
if (!info->fb.vbase) if (!info->fb.vbase)
{ {
@ -1484,11 +1482,11 @@ void __exit xgi_exit_module(void)
xgi_cmdlist_cleanup(&xgi_devices[i]); xgi_cmdlist_cleanup(&xgi_devices[i]);
if (xgi_devices[i].fb.vbase != NULL) { if (xgi_devices[i].fb.vbase != NULL) {
iounmap((void *)xgi_devices[i].fb.vbase); iounmap(xgi_devices[i].fb.vbase);
xgi_devices[i].fb.vbase = NULL; xgi_devices[i].fb.vbase = NULL;
} }
if (xgi_devices[i].mmio.vbase != NULL) { if (xgi_devices[i].mmio.vbase != NULL) {
iounmap((void *)xgi_devices[i].mmio.vbase); iounmap(xgi_devices[i].mmio.vbase);
xgi_devices[i].mmio.vbase = NULL; xgi_devices[i].mmio.vbase = NULL;
} }
//release_mem_region(xgi_devices[i].fb.base, xgi_devices[i].fb.size); //release_mem_region(xgi_devices[i].fb.base, xgi_devices[i].fb.size);

6
linux-core/xgi_drv.h
View File

@ -94,9 +94,9 @@
#define XGI_CONTROL_DEVICE_NUMBER 100 #define XGI_CONTROL_DEVICE_NUMBER 100
struct xgi_aperture { struct xgi_aperture {
U32 base; // pcie base is different from fb base unsigned long base;
U32 size; unsigned int size;
u8 *vbase; void *vbase;
}; };
struct xgi_screen_info { struct xgi_screen_info {