Commit 7598a3cf authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] death of generic-3.0.c = folded into generic.c

parent 6fe3bc99
agpgart-y := backend.o frontend.o generic.o generic-3.0.o isoch.o agpgart-y := backend.o frontend.o generic.o isoch.o
obj-$(CONFIG_AGP) += agpgart.o obj-$(CONFIG_AGP) += agpgart.o
obj-$(CONFIG_AGP_ALI) += ali-agp.o obj-$(CONFIG_AGP_ALI) += ali-agp.o
......
/*
* Generic routines for AGP 3.0 compliant bridges.
*/
#include <linux/list.h>
#include <linux/pci.h>
#include <linux/agp_backend.h>
#include <linux/module.h>
#include "agp.h"
/*
* Fully configure and enable an AGP 3.0 host bridge and all the devices
* lying behind it.
*/
int agp_3_0_enable(struct agp_bridge_data *bridge, u32 mode)
{
return 0;
}
...@@ -461,6 +461,12 @@ void get_agp_version(struct agp_bridge_data *bridge) ...@@ -461,6 +461,12 @@ void get_agp_version(struct agp_bridge_data *bridge)
EXPORT_SYMBOL(get_agp_version); EXPORT_SYMBOL(get_agp_version);
static int agp_3_0_enable(struct agp_bridge_data *bridge, u32 mode)
{
return 0;
}
void agp_generic_enable(u32 mode) void agp_generic_enable(u32 mode)
{ {
u32 command; u32 command;
...@@ -476,8 +482,8 @@ void agp_generic_enable(u32 mode) ...@@ -476,8 +482,8 @@ void agp_generic_enable(u32 mode)
pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx + 0x4, &agp_3_0); pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx + 0x4, &agp_3_0);
/* Check to see if we are operating in 3.0 mode */ /* Check to see if we are operating in 3.0 mode */
if((agp_3_0 >> 3) & 0x1) { if((agp_3_0 >> 3) & 0x1) {
if (agp_bridge->minor_version >= 5) if (agp_bridge->minor_version < 5)
agp_3_5_enable(agp_bridge, mode); agp_3_0_enable(agp_bridge, mode);
else else
agp_3_5_enable(agp_bridge, mode); agp_3_5_enable(agp_bridge, mode);
return; return;
...@@ -849,6 +855,7 @@ void agp_enable(u32 mode) ...@@ -849,6 +855,7 @@ void agp_enable(u32 mode)
} }
EXPORT_SYMBOL(agp_enable); EXPORT_SYMBOL(agp_enable);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void ipi_handler(void *null) static void ipi_handler(void *null)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment