Commit 28082d3b authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Use symbolic defines for isoch registers in isoch code.

parent 7037c102
...@@ -398,7 +398,9 @@ void get_agp_version(struct agp_bridge_data *bridge); ...@@ -398,7 +398,9 @@ void get_agp_version(struct agp_bridge_data *bridge);
/* Standard agp registers */ /* Standard agp registers */
#define AGPSTAT 0x4 #define AGPSTAT 0x4
#define AGPCMD 0x8 #define AGPCMD 0x8
#define AGPNISTAT 0xc
#define AGPNEPG 0x16 #define AGPNEPG 0x16
#define AGPNICMD 0x20
#define AGP_MAJOR_VERSION_SHIFT (20) #define AGP_MAJOR_VERSION_SHIFT (20)
#define AGP_MINOR_VERSION_SHIFT (16) #define AGP_MINOR_VERSION_SHIFT (16)
......
...@@ -44,7 +44,7 @@ static void agp_3_5_dev_list_sort(struct agp_3_5_dev *list, unsigned int ndevs) ...@@ -44,7 +44,7 @@ static void agp_3_5_dev_list_sort(struct agp_3_5_dev *list, unsigned int ndevs)
cur = list_entry(pos, struct agp_3_5_dev, list); cur = list_entry(pos, struct agp_3_5_dev, list);
dev = cur->dev; dev = cur->dev;
pci_read_config_dword(dev, cur->capndx + 0x0c, &nistat); pci_read_config_dword(dev, cur->capndx+AGPNISTAT, &nistat);
cur->maxbw = (nistat >> 16) & 0xff; cur->maxbw = (nistat >> 16) & 0xff;
tmp = pos; tmp = pos;
...@@ -114,7 +114,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -114,7 +114,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
*/ */
agp_3_5_dev_list_sort(dev_list, ndevs); agp_3_5_dev_list_sort(dev_list, ndevs);
pci_read_config_dword(td, bridge->capndx + 0x0c, &tnistat); pci_read_config_dword(td, bridge->capndx+AGPNISTAT, &tnistat);
pci_read_config_dword(td, bridge->capndx+AGPSTAT, &tstatus); pci_read_config_dword(td, bridge->capndx+AGPSTAT, &tstatus);
/* Extract power-on defaults from the target */ /* Extract power-on defaults from the target */
...@@ -137,7 +137,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -137,7 +137,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
mcapndx = cur->capndx; mcapndx = cur->capndx;
pci_read_config_dword(dev, cur->capndx + 0x0c, &mnistat); pci_read_config_dword(dev, cur->capndx+AGPNISTAT, &mnistat);
master[cdev].maxbw = (mnistat >> 16) & 0xff; master[cdev].maxbw = (mnistat >> 16) & 0xff;
master[cdev].n = (mnistat >> 8) & 0xff; master[cdev].n = (mnistat >> 8) & 0xff;
...@@ -167,13 +167,13 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -167,13 +167,13 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
* in the target's NISTAT register, so we need to do this now * in the target's NISTAT register, so we need to do this now
* to get an accurate value for ISOCH_N later. * to get an accurate value for ISOCH_N later.
*/ */
pci_read_config_word(td, bridge->capndx + 0x20, &tnicmd); pci_read_config_word(td, bridge->capndx+AGPNICMD, &tnicmd);
tnicmd &= ~(0x3 << 6); tnicmd &= ~(0x3 << 6);
tnicmd |= target.y << 6; tnicmd |= target.y << 6;
pci_write_config_word(td, bridge->capndx + 0x20, tnicmd); pci_write_config_word(td, bridge->capndx+AGPNICMD, tnicmd);
/* Reread the target's ISOCH_N */ /* Reread the target's ISOCH_N */
pci_read_config_dword(td, bridge->capndx + 0x0c, &tnistat); pci_read_config_dword(td, bridge->capndx+AGPNISTAT, &tnistat);
target.n = (tnistat >> 8) & 0xff; target.n = (tnistat >> 8) & 0xff;
/* Calculate the minimum ISOCH_N needed by each master */ /* Calculate the minimum ISOCH_N needed by each master */
...@@ -256,7 +256,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -256,7 +256,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
master[cdev].rq += (cdev == ndevs - 1) master[cdev].rq += (cdev == ndevs - 1)
? (rem_async + rem_isoch) : step; ? (rem_async + rem_isoch) : step;
pci_read_config_word(dev, cur->capndx + 0x20, &mnicmd); pci_read_config_word(dev, cur->capndx+AGPNICMD, &mnicmd);
pci_read_config_dword(dev, cur->capndx+AGPCMD, &mcmd); pci_read_config_dword(dev, cur->capndx+AGPCMD, &mcmd);
mnicmd &= ~(0xff << 8); mnicmd &= ~(0xff << 8);
...@@ -268,7 +268,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -268,7 +268,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
mcmd |= master[cdev].rq << 24; mcmd |= master[cdev].rq << 24;
pci_write_config_dword(dev, cur->capndx+AGPCMD, mcmd); pci_write_config_dword(dev, cur->capndx+AGPCMD, mcmd);
pci_write_config_word(dev, cur->capndx + 0x20, mnicmd); pci_write_config_word(dev, cur->capndx+AGPNICMD, mnicmd);
} }
free_and_exit: free_and_exit:
...@@ -294,7 +294,7 @@ static void agp_3_5_nonisochronous_node_enable(struct agp_bridge_data *bridge, ...@@ -294,7 +294,7 @@ static void agp_3_5_nonisochronous_node_enable(struct agp_bridge_data *bridge,
u32 trq, mrq, rem; u32 trq, mrq, rem;
unsigned int cdev = 0; unsigned int cdev = 0;
pci_read_config_dword(bridge->dev, bridge->capndx + 0x04, &tstatus); pci_read_config_dword(bridge->dev, bridge->capndx+AGPSTAT, &tstatus);
trq = (tstatus >> 24) & 0xff; trq = (tstatus >> 24) & 0xff;
mrq = trq / ndevs; mrq = trq / ndevs;
...@@ -377,7 +377,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge, u32 mode) ...@@ -377,7 +377,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge, u32 mode)
} }
/* Extract some power-on defaults from the target */ /* Extract some power-on defaults from the target */
pci_read_config_dword(td, bridge->capndx + 0x04, &tstatus); pci_read_config_dword(td, bridge->capndx+AGPSTAT, &tstatus);
isoch = (tstatus >> 17) & 0x1; isoch = (tstatus >> 17) & 0x1;
arqsz = (tstatus >> 13) & 0x7; arqsz = (tstatus >> 13) & 0x7;
cal_cycle = (tstatus >> 10) & 0x7; cal_cycle = (tstatus >> 10) & 0x7;
...@@ -426,7 +426,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge, u32 mode) ...@@ -426,7 +426,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge, u32 mode)
cur->capndx = mcapndx; cur->capndx = mcapndx;
pci_read_config_dword(dev, cur->capndx + 0x04, &mstatus); pci_read_config_dword(dev, cur->capndx+AGPSTAT, &mstatus);
if(((mstatus >> 3) & 0x1) == 0) { if(((mstatus >> 3) & 0x1) == 0) {
printk(KERN_ERR PFX "woah! AGP 3.x device " printk(KERN_ERR PFX "woah! AGP 3.x device "
......
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