From 595558b05603a9f03e5240f7407a5dbe20afc7d4 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 1 Jun 2004 11:00:11 +0100 Subject: [PATCH] [AGPGART] Make agp=off work again. This option only worked for the amd64 driver. On every other driver, the only thing it did was make it not printk the banner on startup. --- drivers/char/agp/backend.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 7b3f652f6a966..33e1c707d7c59 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c @@ -238,11 +238,14 @@ void agp_put_bridge(struct agp_bridge_data *bridge) } EXPORT_SYMBOL(agp_put_bridge); - + int agp_add_bridge(struct agp_bridge_data *bridge) { int error; + if (agp_off) + return -ENODEV; + if (!bridge->dev) { printk (KERN_DEBUG PFX "Erk, registering with no pci_dev!\n"); return -EINVAL; @@ -308,9 +311,9 @@ EXPORT_SYMBOL(agp_try_unsupported_boot); static int __init agp_init(void) { - if (!agp_off) - printk(KERN_INFO "Linux agpgart interface v%d.%d (c) Dave Jones\n", - AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR); + if (!agp_off) + printk(KERN_INFO "Linux agpgart interface v%d.%d (c) Dave Jones\n", + AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR); return 0; } @@ -325,7 +328,7 @@ static __init int agp_setup(char *s) agp_off = 1; if (!strcmp(s,"try_unsupported")) agp_try_unsupported_boot = 1; - return 1; + return 1; } __setup("agp=", agp_setup); #endif -- 2.53.0