patch-2.4.0-test11 linux/drivers/char/agp/agpgart_be.c
Next file: linux/drivers/char/console.c
Previous file: linux/drivers/char/agp/agp.h
Back to the patch index
Back to the overall index
- Lines: 68
- Date:
Thu Nov 16 13:59:53 2000
- Orig file:
v2.4.0-test10/linux/drivers/char/agp/agpgart_be.c
- Orig date:
Mon Aug 21 08:08:12 2000
diff -u --recursive --new-file v2.4.0-test10/linux/drivers/char/agp/agpgart_be.c linux/drivers/char/agp/agpgart_be.c
@@ -2057,6 +2057,13 @@
"Intel",
"440GX",
intel_generic_setup },
+ /* could we add support for PCI_DEVICE_ID_INTEL_815_1 too ? */
+ { PCI_DEVICE_ID_INTEL_815_0,
+ PCI_VENDOR_ID_INTEL,
+ INTEL_I815,
+ "Intel",
+ "i815",
+ intel_generic_setup },
{ PCI_DEVICE_ID_INTEL_840_0,
PCI_VENDOR_ID_INTEL,
INTEL_I840,
@@ -2182,16 +2189,16 @@
{
int i;
- for (i = 0; i < arraysize (agp_bridge_info); i++)
+ for (i = 0; i < ARRAY_SIZE (agp_bridge_info); i++)
if (pdev->vendor == agp_bridge_info[i].vendor_id)
break;
- if (i >= arraysize (agp_bridge_info)) {
+ if (i >= ARRAY_SIZE (agp_bridge_info)) {
printk (KERN_DEBUG PFX "unsupported bridge\n");
return -ENODEV;
}
- while ((i < arraysize (agp_bridge_info)) &&
+ while ((i < ARRAY_SIZE (agp_bridge_info)) &&
(agp_bridge_info[i].vendor_id == pdev->vendor)) {
if (pdev->device == agp_bridge_info[i].device_id) {
printk (KERN_INFO PFX "Detected %s %s chipset\n",
@@ -2490,6 +2497,17 @@
extern int agp_frontend_initialize(void);
extern void agp_frontend_cleanup(void);
+static const drm_agp_t drm_agp = {
+ &agp_free_memory,
+ &agp_allocate_memory,
+ &agp_bind_memory,
+ &agp_unbind_memory,
+ &agp_enable,
+ &agp_backend_acquire,
+ &agp_backend_release,
+ &agp_copy_info
+};
+
static int __init agp_init(void)
{
int ret_val;
@@ -2509,6 +2527,7 @@
return ret_val;
}
+ inter_module_register("drm_agp", THIS_MODULE, &drm_agp);
return 0;
}
@@ -2516,6 +2535,7 @@
{
agp_frontend_cleanup();
agp_backend_cleanup();
+ inter_module_unregister("drm_agp");
}
module_init(agp_init);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)