Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
da2e3ac8
Commit
da2e3ac8
authored
Sep 15, 2009
by
Stephen Rothwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'agp/agp-next'
Conflicts: drivers/char/agp/uninorth-agp.c
parents
55a71bc2
12126482
Changes
23
Show whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
254 additions
and
117 deletions
+254
-117
arch/alpha/include/asm/agp.h
arch/alpha/include/asm/agp.h
+0
-4
arch/ia64/include/asm/agp.h
arch/ia64/include/asm/agp.h
+0
-4
arch/parisc/include/asm/agp.h
arch/parisc/include/asm/agp.h
+0
-4
arch/powerpc/include/asm/agp.h
arch/powerpc/include/asm/agp.h
+0
-4
arch/sparc/include/asm/agp.h
arch/sparc/include/asm/agp.h
+0
-4
arch/x86/include/asm/agp.h
arch/x86/include/asm/agp.h
+0
-4
drivers/char/agp/agp.h
drivers/char/agp/agp.h
+9
-6
drivers/char/agp/ali-agp.c
drivers/char/agp/ali-agp.c
+2
-2
drivers/char/agp/amd-k7-agp.c
drivers/char/agp/amd-k7-agp.c
+6
-4
drivers/char/agp/amd64-agp.c
drivers/char/agp/amd64-agp.c
+4
-3
drivers/char/agp/ati-agp.c
drivers/char/agp/ati-agp.c
+4
-3
drivers/char/agp/backend.c
drivers/char/agp/backend.c
+27
-5
drivers/char/agp/efficeon-agp.c
drivers/char/agp/efficeon-agp.c
+2
-2
drivers/char/agp/generic.c
drivers/char/agp/generic.c
+15
-5
drivers/char/agp/hp-agp.c
drivers/char/agp/hp-agp.c
+3
-5
drivers/char/agp/i460-agp.c
drivers/char/agp/i460-agp.c
+5
-12
drivers/char/agp/intel-agp.c
drivers/char/agp/intel-agp.c
+158
-24
drivers/char/agp/nvidia-agp.c
drivers/char/agp/nvidia-agp.c
+1
-1
drivers/char/agp/parisc-agp.c
drivers/char/agp/parisc-agp.c
+2
-10
drivers/char/agp/sgi-agp.c
drivers/char/agp/sgi-agp.c
+4
-4
drivers/char/agp/sworks-agp.c
drivers/char/agp/sworks-agp.c
+6
-4
drivers/char/agp/uninorth-agp.c
drivers/char/agp/uninorth-agp.c
+2
-2
include/linux/agp_backend.h
include/linux/agp_backend.h
+4
-1
No files found.
arch/alpha/include/asm/agp.h
View file @
da2e3ac8
...
@@ -9,10 +9,6 @@
...
@@ -9,10 +9,6 @@
#define unmap_page_from_agp(page)
#define unmap_page_from_agp(page)
#define flush_agp_cache() mb()
#define flush_agp_cache() mb()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
arch/ia64/include/asm/agp.h
View file @
da2e3ac8
...
@@ -17,10 +17,6 @@
...
@@ -17,10 +17,6 @@
#define unmap_page_from_agp(page)
/* nothing */
#define unmap_page_from_agp(page)
/* nothing */
#define flush_agp_cache() mb()
#define flush_agp_cache() mb()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
arch/parisc/include/asm/agp.h
View file @
da2e3ac8
...
@@ -11,10 +11,6 @@
...
@@ -11,10 +11,6 @@
#define unmap_page_from_agp(page)
/* nothing */
#define unmap_page_from_agp(page)
/* nothing */
#define flush_agp_cache() mb()
#define flush_agp_cache() mb()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
arch/powerpc/include/asm/agp.h
View file @
da2e3ac8
...
@@ -8,10 +8,6 @@
...
@@ -8,10 +8,6 @@
#define unmap_page_from_agp(page)
#define unmap_page_from_agp(page)
#define flush_agp_cache() mb()
#define flush_agp_cache() mb()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
arch/sparc/include/asm/agp.h
View file @
da2e3ac8
...
@@ -7,10 +7,6 @@
...
@@ -7,10 +7,6 @@
#define unmap_page_from_agp(page)
#define unmap_page_from_agp(page)
#define flush_agp_cache() mb()
#define flush_agp_cache() mb()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
arch/x86/include/asm/agp.h
View file @
da2e3ac8
...
@@ -22,10 +22,6 @@
...
@@ -22,10 +22,6 @@
*/
*/
#define flush_agp_cache() wbinvd()
#define flush_agp_cache() wbinvd()
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
((char *)__get_free_pages(GFP_KERNEL, (order)))
...
...
drivers/char/agp/agp.h
View file @
da2e3ac8
...
@@ -107,7 +107,7 @@ struct agp_bridge_driver {
...
@@ -107,7 +107,7 @@ struct agp_bridge_driver {
void
(
*
agp_enable
)(
struct
agp_bridge_data
*
,
u32
);
void
(
*
agp_enable
)(
struct
agp_bridge_data
*
,
u32
);
void
(
*
cleanup
)(
void
);
void
(
*
cleanup
)(
void
);
void
(
*
tlb_flush
)(
struct
agp_memory
*
);
void
(
*
tlb_flush
)(
struct
agp_memory
*
);
unsigned
long
(
*
mask_memory
)(
struct
agp_bridge_data
*
,
struct
page
*
,
int
);
unsigned
long
(
*
mask_memory
)(
struct
agp_bridge_data
*
,
dma_addr_t
,
int
);
void
(
*
cache_flush
)(
void
);
void
(
*
cache_flush
)(
void
);
int
(
*
create_gatt_table
)(
struct
agp_bridge_data
*
);
int
(
*
create_gatt_table
)(
struct
agp_bridge_data
*
);
int
(
*
free_gatt_table
)(
struct
agp_bridge_data
*
);
int
(
*
free_gatt_table
)(
struct
agp_bridge_data
*
);
...
@@ -121,6 +121,11 @@ struct agp_bridge_driver {
...
@@ -121,6 +121,11 @@ struct agp_bridge_driver {
void
(
*
agp_destroy_pages
)(
struct
agp_memory
*
);
void
(
*
agp_destroy_pages
)(
struct
agp_memory
*
);
int
(
*
agp_type_to_mask_type
)
(
struct
agp_bridge_data
*
,
int
);
int
(
*
agp_type_to_mask_type
)
(
struct
agp_bridge_data
*
,
int
);
void
(
*
chipset_flush
)(
struct
agp_bridge_data
*
);
void
(
*
chipset_flush
)(
struct
agp_bridge_data
*
);
int
(
*
agp_map_page
)(
struct
page
*
page
,
dma_addr_t
*
ret
);
void
(
*
agp_unmap_page
)(
struct
page
*
page
,
dma_addr_t
dma
);
int
(
*
agp_map_memory
)(
struct
agp_memory
*
mem
);
void
(
*
agp_unmap_memory
)(
struct
agp_memory
*
mem
);
};
};
struct
agp_bridge_data
{
struct
agp_bridge_data
{
...
@@ -134,7 +139,8 @@ struct agp_bridge_data {
...
@@ -134,7 +139,8 @@ struct agp_bridge_data {
u32
__iomem
*
gatt_table
;
u32
__iomem
*
gatt_table
;
u32
*
gatt_table_real
;
u32
*
gatt_table_real
;
unsigned
long
scratch_page
;
unsigned
long
scratch_page
;
unsigned
long
scratch_page_real
;
struct
page
*
scratch_page_page
;
dma_addr_t
scratch_page_dma
;
unsigned
long
gart_bus_addr
;
unsigned
long
gart_bus_addr
;
unsigned
long
gatt_bus_addr
;
unsigned
long
gatt_bus_addr
;
u32
mode
;
u32
mode
;
...
@@ -291,7 +297,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge);
...
@@ -291,7 +297,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge);
void
global_cache_flush
(
void
);
void
global_cache_flush
(
void
);
void
get_agp_version
(
struct
agp_bridge_data
*
bridge
);
void
get_agp_version
(
struct
agp_bridge_data
*
bridge
);
unsigned
long
agp_generic_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
agp_generic_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
);
dma_addr_t
phys
,
int
type
);
int
agp_generic_type_to_mask_type
(
struct
agp_bridge_data
*
bridge
,
int
agp_generic_type_to_mask_type
(
struct
agp_bridge_data
*
bridge
,
int
type
);
int
type
);
struct
agp_bridge_data
*
agp_generic_find_bridge
(
struct
pci_dev
*
pdev
);
struct
agp_bridge_data
*
agp_generic_find_bridge
(
struct
pci_dev
*
pdev
);
...
@@ -312,9 +318,6 @@ void agp3_generic_cleanup(void);
...
@@ -312,9 +318,6 @@ void agp3_generic_cleanup(void);
#define AGP_GENERIC_SIZES_ENTRIES 11
#define AGP_GENERIC_SIZES_ENTRIES 11
extern
const
struct
aper_size_info_16
agp3_generic_sizes
[];
extern
const
struct
aper_size_info_16
agp3_generic_sizes
[];
#define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))
#define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))
extern
int
agp_off
;
extern
int
agp_off
;
extern
int
agp_try_unsupported_boot
;
extern
int
agp_try_unsupported_boot
;
...
...
drivers/char/agp/ali-agp.c
View file @
da2e3ac8
...
@@ -152,7 +152,7 @@ static struct page *m1541_alloc_page(struct agp_bridge_data *bridge)
...
@@ -152,7 +152,7 @@ static struct page *m1541_alloc_page(struct agp_bridge_data *bridge)
pci_read_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
&
temp
);
pci_read_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
&
temp
);
pci_write_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
pci_write_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
(((
temp
&
ALI_CACHE_FLUSH_ADDR_MASK
)
|
(((
temp
&
ALI_CACHE_FLUSH_ADDR_MASK
)
|
p
hys_to_gart
(
page_to_phys
(
page
)
))
|
ALI_CACHE_FLUSH_EN
));
p
age_to_phys
(
page
))
|
ALI_CACHE_FLUSH_EN
));
return
page
;
return
page
;
}
}
...
@@ -180,7 +180,7 @@ static void m1541_destroy_page(struct page *page, int flags)
...
@@ -180,7 +180,7 @@ static void m1541_destroy_page(struct page *page, int flags)
pci_read_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
&
temp
);
pci_read_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
&
temp
);
pci_write_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
pci_write_config_dword
(
agp_bridge
->
dev
,
ALI_CACHE_FLUSH_CTRL
,
(((
temp
&
ALI_CACHE_FLUSH_ADDR_MASK
)
|
(((
temp
&
ALI_CACHE_FLUSH_ADDR_MASK
)
|
p
hys_to_gart
(
page_to_phys
(
page
)
))
|
ALI_CACHE_FLUSH_EN
));
p
age_to_phys
(
page
))
|
ALI_CACHE_FLUSH_EN
));
}
}
agp_generic_destroy_page
(
page
,
flags
);
agp_generic_destroy_page
(
page
,
flags
);
}
}
...
...
drivers/char/agp/amd-k7-agp.c
View file @
da2e3ac8
...
@@ -44,7 +44,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
...
@@ -44,7 +44,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
#ifndef CONFIG_X86
#ifndef CONFIG_X86
SetPageReserved
(
virt_to_page
(
page_map
->
real
));
SetPageReserved
(
virt_to_page
(
page_map
->
real
));
global_cache_flush
();
global_cache_flush
();
page_map
->
remapped
=
ioremap_nocache
(
virt_to_
gart
(
page_map
->
real
),
page_map
->
remapped
=
ioremap_nocache
(
virt_to_
phys
(
page_map
->
real
),
PAGE_SIZE
);
PAGE_SIZE
);
if
(
page_map
->
remapped
==
NULL
)
{
if
(
page_map
->
remapped
==
NULL
)
{
ClearPageReserved
(
virt_to_page
(
page_map
->
real
));
ClearPageReserved
(
virt_to_page
(
page_map
->
real
));
...
@@ -160,7 +160,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -160,7 +160,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_bus_addr
=
virt_to_
gart
(
page_dir
.
real
);
agp_bridge
->
gatt_bus_addr
=
virt_to_
phys
(
page_dir
.
real
);
/* Get the address for the gart region.
/* Get the address for the gart region.
* This is a bus address even on the alpha, b/c its
* This is a bus address even on the alpha, b/c its
...
@@ -173,7 +173,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -173,7 +173,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
/* Calculate the agp offset */
/* Calculate the agp offset */
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
,
addr
+=
0x00400000
)
{
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
,
addr
+=
0x00400000
)
{
writel
(
virt_to_
gart
(
amd_irongate_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
writel
(
virt_to_
phys
(
amd_irongate_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
readl
(
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
/* PCI Posting. */
readl
(
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
/* PCI Posting. */
}
}
...
@@ -325,7 +325,9 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
...
@@ -325,7 +325,9 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
cur_gatt
=
GET_GATT
(
addr
);
cur_gatt
=
GET_GATT
(
addr
);
writel
(
agp_generic_mask_memory
(
agp_bridge
,
writel
(
agp_generic_mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
mem
->
type
),
cur_gatt
+
GET_GATT_OFF
(
addr
));
page_to_phys
(
mem
->
pages
[
i
]),
mem
->
type
),
cur_gatt
+
GET_GATT_OFF
(
addr
));
readl
(
cur_gatt
+
GET_GATT_OFF
(
addr
));
/* PCI Posting. */
readl
(
cur_gatt
+
GET_GATT_OFF
(
addr
));
/* PCI Posting. */
}
}
amd_irongate_tlbflush
(
mem
);
amd_irongate_tlbflush
(
mem
);
...
...
drivers/char/agp/amd64-agp.c
View file @
da2e3ac8
...
@@ -79,7 +79,8 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
...
@@ -79,7 +79,8 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
tmp
=
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
tmp
=
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
mask_type
);
page_to_phys
(
mem
->
pages
[
i
]),
mask_type
);
BUG_ON
(
tmp
&
0xffffff0000000ffcULL
);
BUG_ON
(
tmp
&
0xffffff0000000ffcULL
);
pte
=
(
tmp
&
0x000000ff00000000ULL
)
>>
28
;
pte
=
(
tmp
&
0x000000ff00000000ULL
)
>>
28
;
...
@@ -177,7 +178,7 @@ static const struct aper_size_info_32 amd_8151_sizes[7] =
...
@@ -177,7 +178,7 @@ static const struct aper_size_info_32 amd_8151_sizes[7] =
static
int
amd_8151_configure
(
void
)
static
int
amd_8151_configure
(
void
)
{
{
unsigned
long
gatt_bus
=
virt_to_
gart
(
agp_bridge
->
gatt_table_real
);
unsigned
long
gatt_bus
=
virt_to_
phys
(
agp_bridge
->
gatt_table_real
);
int
i
;
int
i
;
/* Configure AGP regs in each x86-64 host bridge. */
/* Configure AGP regs in each x86-64 host bridge. */
...
@@ -557,7 +558,7 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
...
@@ -557,7 +558,7 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
{
{
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
release_mem_region
(
virt_to_
gart
(
bridge
->
gatt_table_real
),
release_mem_region
(
virt_to_
phys
(
bridge
->
gatt_table_real
),
amd64_aperture_sizes
[
bridge
->
aperture_size_idx
].
size
);
amd64_aperture_sizes
[
bridge
->
aperture_size_idx
].
size
);
agp_remove_bridge
(
bridge
);
agp_remove_bridge
(
bridge
);
agp_put_bridge
(
bridge
);
agp_put_bridge
(
bridge
);
...
...
drivers/char/agp/ati-agp.c
View file @
da2e3ac8
...
@@ -302,7 +302,8 @@ static int ati_insert_memory(struct agp_memory * mem,
...
@@ -302,7 +302,8 @@ static int ati_insert_memory(struct agp_memory * mem,
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
cur_gatt
=
GET_GATT
(
addr
);
cur_gatt
=
GET_GATT
(
addr
);
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
mem
->
type
),
page_to_phys
(
mem
->
pages
[
i
]),
mem
->
type
),
cur_gatt
+
GET_GATT_OFF
(
addr
));
cur_gatt
+
GET_GATT_OFF
(
addr
));
}
}
readl
(
GET_GATT
(
agp_bridge
->
gart_bus_addr
));
/* PCI posting */
readl
(
GET_GATT
(
agp_bridge
->
gart_bus_addr
));
/* PCI posting */
...
@@ -359,7 +360,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -359,7 +360,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_bus_addr
=
virt_to_
gart
(
page_dir
.
real
);
agp_bridge
->
gatt_bus_addr
=
virt_to_
phys
(
page_dir
.
real
);
/* Write out the size register */
/* Write out the size register */
current_size
=
A_SIZE_LVL2
(
agp_bridge
->
current_size
);
current_size
=
A_SIZE_LVL2
(
agp_bridge
->
current_size
);
...
@@ -389,7 +390,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -389,7 +390,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
/* Calculate the agp offset */
/* Calculate the agp offset */
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
,
addr
+=
0x00400000
)
{
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
,
addr
+=
0x00400000
)
{
writel
(
virt_to_
gart
(
ati_generic_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
writel
(
virt_to_
phys
(
ati_generic_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
readl
(
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
/* PCI Posting. */
readl
(
page_dir
.
remapped
+
GET_PAGE_DIR_OFF
(
addr
));
/* PCI Posting. */
}
}
...
...
drivers/char/agp/backend.c
View file @
da2e3ac8
...
@@ -149,9 +149,21 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
...
@@ -149,9 +149,21 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
bridge
->
scratch_page_real
=
phys_to_gart
(
page_to_phys
(
page
));
bridge
->
scratch_page_page
=
page
;
bridge
->
scratch_page
=
if
(
bridge
->
driver
->
agp_map_page
)
{
bridge
->
driver
->
mask_memory
(
bridge
,
page
,
0
);
if
(
bridge
->
driver
->
agp_map_page
(
page
,
&
bridge
->
scratch_page_dma
))
{
dev_err
(
&
bridge
->
dev
->
dev
,
"unable to dma-map scratch page
\n
"
);
rc
=
-
ENOMEM
;
goto
err_out_nounmap
;
}
}
else
{
bridge
->
scratch_page_dma
=
page_to_phys
(
page
);
}
bridge
->
scratch_page
=
bridge
->
driver
->
mask_memory
(
bridge
,
bridge
->
scratch_page_dma
,
0
);
}
}
size_value
=
bridge
->
driver
->
fetch_size
();
size_value
=
bridge
->
driver
->
fetch_size
();
...
@@ -191,8 +203,14 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
...
@@ -191,8 +203,14 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
return
0
;
return
0
;
err_out:
err_out:
if
(
bridge
->
driver
->
needs_scratch_page
&&
bridge
->
driver
->
agp_unmap_page
)
{
bridge
->
driver
->
agp_unmap_page
(
bridge
->
scratch_page_page
,
bridge
->
scratch_page_dma
);
}
err_out_nounmap:
if
(
bridge
->
driver
->
needs_scratch_page
)
{
if
(
bridge
->
driver
->
needs_scratch_page
)
{
void
*
va
=
gart_to_virt
(
bridge
->
scratch_page_real
);
void
*
va
=
page_address
(
bridge
->
scratch_page_page
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_UNMAP
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_UNMAP
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_FREE
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_FREE
);
...
@@ -219,7 +237,11 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
...
@@ -219,7 +237,11 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
if
(
bridge
->
driver
->
agp_destroy_page
&&
if
(
bridge
->
driver
->
agp_destroy_page
&&
bridge
->
driver
->
needs_scratch_page
)
{
bridge
->
driver
->
needs_scratch_page
)
{
void
*
va
=
gart_to_virt
(
bridge
->
scratch_page_real
);
void
*
va
=
page_address
(
bridge
->
scratch_page_page
);
if
(
bridge
->
driver
->
agp_unmap_page
)
bridge
->
driver
->
agp_unmap_page
(
bridge
->
scratch_page_page
,
bridge
->
scratch_page_dma
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_UNMAP
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_UNMAP
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_FREE
);
bridge
->
driver
->
agp_destroy_page
(
va
,
AGP_PAGE_DESTROY_FREE
);
...
...
drivers/char/agp/efficeon-agp.c
View file @
da2e3ac8
...
@@ -67,7 +67,7 @@ static const struct gatt_mask efficeon_generic_masks[] =
...
@@ -67,7 +67,7 @@ static const struct gatt_mask efficeon_generic_masks[] =
/* This function does the same thing as mask_memory() for this chipset... */
/* This function does the same thing as mask_memory() for this chipset... */
static
inline
unsigned
long
efficeon_mask_memory
(
struct
page
*
page
)
static
inline
unsigned
long
efficeon_mask_memory
(
struct
page
*
page
)
{
{
unsigned
long
addr
=
p
hys_to_gart
(
page_to_phys
(
page
)
);
unsigned
long
addr
=
p
age_to_phys
(
page
);
return
addr
|
0x00000001
;
return
addr
|
0x00000001
;
}
}
...
@@ -226,7 +226,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -226,7 +226,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
efficeon_private
.
l1_table
[
index
]
=
page
;
efficeon_private
.
l1_table
[
index
]
=
page
;
value
=
virt_to_
gart
((
unsigned
long
*
)
page
)
|
pati
|
present
|
index
;
value
=
virt_to_
phys
((
unsigned
long
*
)
page
)
|
pati
|
present
|
index
;
pci_write_config_dword
(
agp_bridge
->
dev
,
pci_write_config_dword
(
agp_bridge
->
dev
,
EFFICEON_ATTPAGE
,
value
);
EFFICEON_ATTPAGE
,
value
);
...
...
drivers/char/agp/generic.c
View file @
da2e3ac8
...
@@ -437,6 +437,12 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
...
@@ -437,6 +437,12 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
curr
->
bridge
->
driver
->
cache_flush
();
curr
->
bridge
->
driver
->
cache_flush
();
curr
->
is_flushed
=
true
;
curr
->
is_flushed
=
true
;
}
}
if
(
curr
->
bridge
->
driver
->
agp_map_memory
)
{
ret_val
=
curr
->
bridge
->
driver
->
agp_map_memory
(
curr
);
if
(
ret_val
)
return
ret_val
;
}
ret_val
=
curr
->
bridge
->
driver
->
insert_memory
(
curr
,
pg_start
,
curr
->
type
);
ret_val
=
curr
->
bridge
->
driver
->
insert_memory
(
curr
,
pg_start
,
curr
->
type
);
if
(
ret_val
!=
0
)
if
(
ret_val
!=
0
)
...
@@ -478,6 +484,9 @@ int agp_unbind_memory(struct agp_memory *curr)
...
@@ -478,6 +484,9 @@ int agp_unbind_memory(struct agp_memory *curr)
if
(
ret_val
!=
0
)
if
(
ret_val
!=
0
)
return
ret_val
;
return
ret_val
;
if
(
curr
->
bridge
->
driver
->
agp_unmap_memory
)
curr
->
bridge
->
driver
->
agp_unmap_memory
(
curr
);
curr
->
is_bound
=
false
;
curr
->
is_bound
=
false
;
curr
->
pg_start
=
0
;
curr
->
pg_start
=
0
;
spin_lock
(
&
curr
->
bridge
->
mapped_lock
);
spin_lock
(
&
curr
->
bridge
->
mapped_lock
);
...
@@ -979,7 +988,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -979,7 +988,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
set_memory_uc
((
unsigned
long
)
table
,
1
<<
page_order
);
set_memory_uc
((
unsigned
long
)
table
,
1
<<
page_order
);
bridge
->
gatt_table
=
(
void
*
)
table
;
bridge
->
gatt_table
=
(
void
*
)
table
;
#else
#else
bridge
->
gatt_table
=
ioremap_nocache
(
virt_to_
gart
(
table
),
bridge
->
gatt_table
=
ioremap_nocache
(
virt_to_
phys
(
table
),
(
PAGE_SIZE
*
(
1
<<
page_order
)));
(
PAGE_SIZE
*
(
1
<<
page_order
)));
bridge
->
driver
->
cache_flush
();
bridge
->
driver
->
cache_flush
();
#endif
#endif
...
@@ -992,7 +1001,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -992,7 +1001,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
bridge
->
gatt_bus_addr
=
virt_to_
gart
(
bridge
->
gatt_table_real
);
bridge
->
gatt_bus_addr
=
virt_to_
phys
(
bridge
->
gatt_table_real
);
/* AK: bogus, should encode addresses > 4GB */
/* AK: bogus, should encode addresses > 4GB */
for
(
i
=
0
;
i
<
num_entries
;
i
++
)
{
for
(
i
=
0
;
i
<
num_entries
;
i
++
)
{
...
@@ -1132,7 +1141,9 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
...
@@ -1132,7 +1141,9 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
}
}
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
writel
(
bridge
->
driver
->
mask_memory
(
bridge
,
mem
->
pages
[
i
],
mask_type
),
writel
(
bridge
->
driver
->
mask_memory
(
bridge
,
page_to_phys
(
mem
->
pages
[
i
]),
mask_type
),
bridge
->
gatt_table
+
j
);
bridge
->
gatt_table
+
j
);
}
}
readl
(
bridge
->
gatt_table
+
j
-
1
);
/* PCI Posting. */
readl
(
bridge
->
gatt_table
+
j
-
1
);
/* PCI Posting. */
...
@@ -1347,9 +1358,8 @@ void global_cache_flush(void)
...
@@ -1347,9 +1358,8 @@ void global_cache_flush(void)
EXPORT_SYMBOL
(
global_cache_flush
);
EXPORT_SYMBOL
(
global_cache_flush
);
unsigned
long
agp_generic_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
agp_generic_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
)
dma_addr_t
addr
,
int
type
)
{
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
/* memory type is ignored in the generic routine */
/* memory type is ignored in the generic routine */
if
(
bridge
->
driver
->
masks
)
if
(
bridge
->
driver
->
masks
)
return
addr
|
bridge
->
driver
->
masks
[
0
].
mask
;
return
addr
|
bridge
->
driver
->
masks
[
0
].
mask
;
...
...
drivers/char/agp/hp-agp.c
View file @
da2e3ac8
...
@@ -107,7 +107,7 @@ static int __init hp_zx1_ioc_shared(void)
...
@@ -107,7 +107,7 @@ static int __init hp_zx1_ioc_shared(void)
hp
->
gart_size
=
HP_ZX1_GART_SIZE
;
hp
->
gart_size
=
HP_ZX1_GART_SIZE
;
hp
->
gatt_entries
=
hp
->
gart_size
/
hp
->
io_page_size
;
hp
->
gatt_entries
=
hp
->
gart_size
/
hp
->
io_page_size
;
hp
->
io_pdir
=
gart
_to_virt
(
readq
(
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
));
hp
->
io_pdir
=
phys
_to_virt
(
readq
(
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
));
hp
->
gatt
=
&
hp
->
io_pdir
[
HP_ZX1_IOVA_TO_PDIR
(
hp
->
gart_base
)];
hp
->
gatt
=
&
hp
->
io_pdir
[
HP_ZX1_IOVA_TO_PDIR
(
hp
->
gart_base
)];
if
(
hp
->
gatt
[
0
]
!=
HP_ZX1_SBA_IOMMU_COOKIE
)
{
if
(
hp
->
gatt
[
0
]
!=
HP_ZX1_SBA_IOMMU_COOKIE
)
{
...
@@ -246,7 +246,7 @@ hp_zx1_configure (void)
...
@@ -246,7 +246,7 @@ hp_zx1_configure (void)
agp_bridge
->
mode
=
readl
(
hp
->
lba_regs
+
hp
->
lba_cap_offset
+
PCI_AGP_STATUS
);
agp_bridge
->
mode
=
readl
(
hp
->
lba_regs
+
hp
->
lba_cap_offset
+
PCI_AGP_STATUS
);
if
(
hp
->
io_pdir_owner
)
{
if
(
hp
->
io_pdir_owner
)
{
writel
(
virt_to_
gart
(
hp
->
io_pdir
),
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
);
writel
(
virt_to_
phys
(
hp
->
io_pdir
),
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
);
readl
(
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
);
readl
(
hp
->
ioc_regs
+
HP_ZX1_PDIR_BASE
);
writel
(
hp
->
io_tlb_ps
,
hp
->
ioc_regs
+
HP_ZX1_TCNFG
);
writel
(
hp
->
io_tlb_ps
,
hp
->
ioc_regs
+
HP_ZX1_TCNFG
);
readl
(
hp
->
ioc_regs
+
HP_ZX1_TCNFG
);
readl
(
hp
->
ioc_regs
+
HP_ZX1_TCNFG
);
...
@@ -394,10 +394,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type)
...
@@ -394,10 +394,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type)
}
}
static
unsigned
long
static
unsigned
long
hp_zx1_mask_memory
(
struct
agp_bridge_data
*
bridge
,
hp_zx1_mask_memory
(
struct
agp_bridge_data
*
bridge
,
dma_addr_t
addr
,
int
type
)
struct
page
*
page
,
int
type
)
{
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
return
HP_ZX1_PDIR_VALID_BIT
|
addr
;
return
HP_ZX1_PDIR_VALID_BIT
|
addr
;
}
}
...
...
drivers/char/agp/i460-agp.c
View file @
da2e3ac8
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
#define WR_FLUSH_GATT(index) RD_GATT(index)
#define WR_FLUSH_GATT(index) RD_GATT(index)
static
unsigned
long
i460_mask_memory
(
struct
agp_bridge_data
*
bridge
,
static
unsigned
long
i460_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
addr
,
int
type
);
dma_addr_t
addr
,
int
type
);
static
struct
{
static
struct
{
void
*
gatt
;
/* ioremap'd GATT area */
void
*
gatt
;
/* ioremap'd GATT area */
...
@@ -325,7 +325,7 @@ static int i460_insert_memory_small_io_page (struct agp_memory *mem,
...
@@ -325,7 +325,7 @@ static int i460_insert_memory_small_io_page (struct agp_memory *mem,
io_page_size
=
1UL
<<
I460_IO_PAGE_SHIFT
;
io_page_size
=
1UL
<<
I460_IO_PAGE_SHIFT
;
for
(
i
=
0
,
j
=
io_pg_start
;
i
<
mem
->
page_count
;
i
++
)
{
for
(
i
=
0
,
j
=
io_pg_start
;
i
<
mem
->
page_count
;
i
++
)
{
paddr
=
p
hys_to_gart
(
page_to_phys
(
mem
->
pages
[
i
])
);
paddr
=
p
age_to_phys
(
mem
->
pages
[
i
]
);
for
(
k
=
0
;
k
<
I460_IOPAGES_PER_KPAGE
;
k
++
,
j
++
,
paddr
+=
io_page_size
)
for
(
k
=
0
;
k
<
I460_IOPAGES_PER_KPAGE
;
k
++
,
j
++
,
paddr
+=
io_page_size
)
WR_GATT
(
j
,
i460_mask_memory
(
agp_bridge
,
paddr
,
mem
->
type
));
WR_GATT
(
j
,
i460_mask_memory
(
agp_bridge
,
paddr
,
mem
->
type
));
}
}
...
@@ -382,7 +382,7 @@ static int i460_alloc_large_page (struct lp_desc *lp)
...
@@ -382,7 +382,7 @@ static int i460_alloc_large_page (struct lp_desc *lp)
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
lp
->
paddr
=
p
hys_to_gart
(
page_to_phys
(
lp
->
page
)
);
lp
->
paddr
=
p
age_to_phys
(
lp
->
page
);
lp
->
refcount
=
0
;
lp
->
refcount
=
0
;
atomic_add
(
I460_KPAGES_PER_IOPAGE
,
&
agp_bridge
->
current_memory_agp
);
atomic_add
(
I460_KPAGES_PER_IOPAGE
,
&
agp_bridge
->
current_memory_agp
);
return
0
;
return
0
;
...
@@ -546,20 +546,13 @@ static void i460_destroy_page (struct page *page, int flags)
...
@@ -546,20 +546,13 @@ static void i460_destroy_page (struct page *page, int flags)
#endif
/* I460_LARGE_IO_PAGES */
#endif
/* I460_LARGE_IO_PAGES */
static
unsigned
long
i460_mask_memory
(
struct
agp_bridge_data
*
bridge
,
static
unsigned
long
i460_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
addr
,
int
type
)
dma_addr_t
addr
,
int
type
)
{
{
/* Make sure the returned address is a valid GATT entry */
/* Make sure the returned address is a valid GATT entry */
return
bridge
->
driver
->
masks
[
0
].
mask
return
bridge
->
driver
->
masks
[
0
].
mask
|
(((
addr
&
~
((
1
<<
I460_IO_PAGE_SHIFT
)
-
1
))
&
0xfffff000
)
>>
12
);
|
(((
addr
&
~
((
1
<<
I460_IO_PAGE_SHIFT
)
-
1
))
&
0xfffff000
)
>>
12
);
}
}
static
unsigned
long
i460_page_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
)
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
return
i460_mask_memory
(
bridge
,
addr
,
type
);
}
const
struct
agp_bridge_driver
intel_i460_driver
=
{
const
struct
agp_bridge_driver
intel_i460_driver
=
{
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
aperture_sizes
=
i460_sizes
,
.
aperture_sizes
=
i460_sizes
,
...
@@ -569,7 +562,7 @@ const struct agp_bridge_driver intel_i460_driver = {
...
@@ -569,7 +562,7 @@ const struct agp_bridge_driver intel_i460_driver = {
.
fetch_size
=
i460_fetch_size
,
.
fetch_size
=
i460_fetch_size
,
.
cleanup
=
i460_cleanup
,
.
cleanup
=
i460_cleanup
,
.
tlb_flush
=
i460_tlb_flush
,
.
tlb_flush
=
i460_tlb_flush
,
.
mask_memory
=
i460_
page_
mask_memory
,
.
mask_memory
=
i460_mask_memory
,
.
masks
=
i460_masks
,
.
masks
=
i460_masks
,
.
agp_enable
=
agp_generic_enable
,
.
agp_enable
=
agp_generic_enable
,
.
cache_flush
=
global_cache_flush
,
.
cache_flush
=
global_cache_flush
,
...
...
drivers/char/agp/intel-agp.c
View file @
da2e3ac8
...
@@ -10,6 +10,16 @@
...
@@ -10,6 +10,16 @@
#include <linux/agp_backend.h>
#include <linux/agp_backend.h>
#include "agp.h"
#include "agp.h"
/*
* If we have Intel graphics, we're not going to have anything other than
* an Intel IOMMU. So make the correct use of the PCI DMA API contingent
* on the Intel IOMMU support (CONFIG_DMAR).
* Only newer chipsets need to bother with this, of course.
*/
#ifdef CONFIG_DMAR
#define USE_PCI_DMA_API 1
#endif
#define PCI_DEVICE_ID_INTEL_E7221_HB 0x2588
#define PCI_DEVICE_ID_INTEL_E7221_HB 0x2588
#define PCI_DEVICE_ID_INTEL_E7221_IG 0x258a
#define PCI_DEVICE_ID_INTEL_E7221_IG 0x258a
#define PCI_DEVICE_ID_INTEL_82946GZ_HB 0x2970
#define PCI_DEVICE_ID_INTEL_82946GZ_HB 0x2970
...
@@ -172,6 +182,123 @@ static struct _intel_private {
...
@@ -172,6 +182,123 @@ static struct _intel_private {
int
resource_valid
;
int
resource_valid
;
}
intel_private
;
}
intel_private
;
#ifdef USE_PCI_DMA_API
static
int
intel_agp_map_page
(
struct
page
*
page
,
dma_addr_t
*
ret
)
{
*
ret
=
pci_map_page
(
intel_private
.
pcidev
,
page
,
0
,
PAGE_SIZE
,
PCI_DMA_BIDIRECTIONAL
);
if
(
pci_dma_mapping_error
(
intel_private
.
pcidev
,
*
ret
))
return
-
EINVAL
;
return
0
;
}
static
void
intel_agp_unmap_page
(
struct
page
*
page
,
dma_addr_t
dma
)
{
pci_unmap_page
(
intel_private
.
pcidev
,
dma
,
PAGE_SIZE
,
PCI_DMA_BIDIRECTIONAL
);
}
static
void
intel_agp_free_sglist
(
struct
agp_memory
*
mem
)
{
struct
sg_table
st
;
st
.
sgl
=
mem
->
sg_list
;
st
.
orig_nents
=
st
.
nents
=
mem
->
page_count
;
sg_free_table
(
&
st
);
mem
->
sg_list
=
NULL
;
mem
->
num_sg
=
0
;
}
static
int
intel_agp_map_memory
(
struct
agp_memory
*
mem
)
{
struct
sg_table
st
;
struct
scatterlist
*
sg
;
int
i
;
DBG
(
"try mapping %lu pages
\n
"
,
(
unsigned
long
)
mem
->
page_count
);
if
(
sg_alloc_table
(
&
st
,
mem
->
page_count
,
GFP_KERNEL
))
return
-
ENOMEM
;
mem
->
sg_list
=
sg
=
st
.
sgl
;
for
(
i
=
0
;
i
<
mem
->
page_count
;
i
++
,
sg
=
sg_next
(
sg
))
sg_set_page
(
sg
,
mem
->
pages
[
i
],
PAGE_SIZE
,
0
);
mem
->
num_sg
=
pci_map_sg
(
intel_private
.
pcidev
,
mem
->
sg_list
,
mem
->
page_count
,
PCI_DMA_BIDIRECTIONAL
);
if
(
unlikely
(
!
mem
->
num_sg
))
{
intel_agp_free_sglist
(
mem
);
return
-
ENOMEM
;
}
return
0
;
}
static
void
intel_agp_unmap_memory
(
struct
agp_memory
*
mem
)
{
DBG
(
"try unmapping %lu pages
\n
"
,
(
unsigned
long
)
mem
->
page_count
);
pci_unmap_sg
(
intel_private
.
pcidev
,
mem
->
sg_list
,
mem
->
page_count
,
PCI_DMA_BIDIRECTIONAL
);
intel_agp_free_sglist
(
mem
);
}
static
void
intel_agp_insert_sg_entries
(
struct
agp_memory
*
mem
,
off_t
pg_start
,
int
mask_type
)
{
struct
scatterlist
*
sg
;
int
i
,
j
;
j
=
pg_start
;
WARN_ON
(
!
mem
->
num_sg
);
if
(
mem
->
num_sg
==
mem
->
page_count
)
{
for_each_sg
(
mem
->
sg_list
,
sg
,
mem
->
page_count
,
i
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
sg_dma_address
(
sg
),
mask_type
),
intel_private
.
gtt
+
j
);
j
++
;
}
}
else
{
/* sg may merge pages, but we have to seperate
* per-page addr for GTT */
unsigned
int
len
,
m
;
for_each_sg
(
mem
->
sg_list
,
sg
,
mem
->
num_sg
,
i
)
{
len
=
sg_dma_len
(
sg
)
/
PAGE_SIZE
;
for
(
m
=
0
;
m
<
len
;
m
++
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
sg_dma_address
(
sg
)
+
m
*
PAGE_SIZE
,
mask_type
),
intel_private
.
gtt
+
j
);
j
++
;
}
}
}
readl
(
intel_private
.
gtt
+
j
-
1
);
}
#else
static
void
intel_agp_insert_sg_entries
(
struct
agp_memory
*
mem
,
off_t
pg_start
,
int
mask_type
)
{
int
i
,
j
;
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
page_to_phys
(
mem
->
pages
[
i
]),
mask_type
),
intel_private
.
gtt
+
j
);
}
readl
(
intel_private
.
gtt
+
j
-
1
);
}
#endif
static
int
intel_i810_fetch_size
(
void
)
static
int
intel_i810_fetch_size
(
void
)
{
{
u32
smram_miscc
;
u32
smram_miscc
;
...
@@ -345,8 +472,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -345,8 +472,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
global_cache_flush
();
global_cache_flush
();
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
page_to_phys
(
mem
->
pages
[
i
]),
mask_type
),
mask_type
),
intel_private
.
registers
+
I810_PTE_BASE
+
(
j
*
4
));
intel_private
.
registers
+
I810_PTE_BASE
+
(
j
*
4
));
}
}
readl
(
intel_private
.
registers
+
I810_PTE_BASE
+
((
j
-
1
)
*
4
));
readl
(
intel_private
.
registers
+
I810_PTE_BASE
+
((
j
-
1
)
*
4
));
...
@@ -463,9 +589,8 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
...
@@ -463,9 +589,8 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
}
}
static
unsigned
long
intel_i810_mask_memory
(
struct
agp_bridge_data
*
bridge
,
static
unsigned
long
intel_i810_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
)
dma_addr_t
addr
,
int
type
)
{
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
/* Type checking must be done elsewhere */
/* Type checking must be done elsewhere */
return
addr
|
bridge
->
driver
->
masks
[
type
].
mask
;
return
addr
|
bridge
->
driver
->
masks
[
type
].
mask
;
}
}
...
@@ -853,7 +978,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -853,7 +978,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
]
,
mask_type
),
page_to_phys
(
mem
->
pages
[
i
])
,
mask_type
),
intel_private
.
registers
+
I810_PTE_BASE
+
(
j
*
4
));
intel_private
.
registers
+
I810_PTE_BASE
+
(
j
*
4
));
}
}
readl
(
intel_private
.
registers
+
I810_PTE_BASE
+
((
j
-
1
)
*
4
));
readl
(
intel_private
.
registers
+
I810_PTE_BASE
+
((
j
-
1
)
*
4
));
...
@@ -1017,6 +1142,12 @@ static int intel_i915_configure(void)
...
@@ -1017,6 +1142,12 @@ static int intel_i915_configure(void)
intel_i9xx_setup_flush
();
intel_i9xx_setup_flush
();
#ifdef USE_PCI_DMA_API
if
(
pci_set_dma_mask
(
intel_private
.
pcidev
,
DMA_BIT_MASK
(
36
)))
dev_err
(
&
intel_private
.
pcidev
->
dev
,
"set gfx device dma mask 36bit failed!
\n
"
);
#endif
return
0
;
return
0
;
}
}
...
@@ -1041,7 +1172,7 @@ static void intel_i915_chipset_flush(struct agp_bridge_data *bridge)
...
@@ -1041,7 +1172,7 @@ static void intel_i915_chipset_flush(struct agp_bridge_data *bridge)
static
int
intel_i915_insert_entries
(
struct
agp_memory
*
mem
,
off_t
pg_start
,
static
int
intel_i915_insert_entries
(
struct
agp_memory
*
mem
,
off_t
pg_start
,
int
type
)
int
type
)
{
{
int
i
,
j
,
num_entries
;
int
num_entries
;
void
*
temp
;
void
*
temp
;
int
ret
=
-
EINVAL
;
int
ret
=
-
EINVAL
;
int
mask_type
;
int
mask_type
;
...
@@ -1065,7 +1196,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -1065,7 +1196,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
if
((
pg_start
+
mem
->
page_count
)
>
num_entries
)
if
((
pg_start
+
mem
->
page_count
)
>
num_entries
)
goto
out_err
;
goto
out_err
;
/* The i915 can't check the GTT for entries since it
s read only,
/* The i915 can't check the GTT for entries since it
's read only;
* depend on the caller to make the correct offset decisions.
* depend on the caller to make the correct offset decisions.
*/
*/
...
@@ -1081,12 +1212,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -1081,12 +1212,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
if
(
!
mem
->
is_flushed
)
if
(
!
mem
->
is_flushed
)
global_cache_flush
();
global_cache_flush
();
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
intel_agp_insert_sg_entries
(
mem
,
pg_start
,
mask_type
);
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
mask_type
),
intel_private
.
gtt
+
j
);
}
readl
(
intel_private
.
gtt
+
j
-
1
);
agp_bridge
->
driver
->
tlb_flush
(
mem
);
agp_bridge
->
driver
->
tlb_flush
(
mem
);
out:
out:
...
@@ -1198,9 +1324,8 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -1198,9 +1324,8 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
* this conditional.
* this conditional.
*/
*/
static
unsigned
long
intel_i965_mask_memory
(
struct
agp_bridge_data
*
bridge
,
static
unsigned
long
intel_i965_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
)
dma_addr_t
addr
,
int
type
)
{
{
dma_addr_t
addr
=
phys_to_gart
(
page_to_phys
(
page
));
/* Shift high bits down */
/* Shift high bits down */
addr
|=
(
addr
>>
28
)
&
0xf0
;
addr
|=
(
addr
>>
28
)
&
0xf0
;
...
@@ -2006,6 +2131,12 @@ static const struct agp_bridge_driver intel_915_driver = {
...
@@ -2006,6 +2131,12 @@ static const struct agp_bridge_driver intel_915_driver = {
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
chipset_flush
=
intel_i915_chipset_flush
,
.
chipset_flush
=
intel_i915_chipset_flush
,
#ifdef USE_PCI_DMA_API
.
agp_map_page
=
intel_agp_map_page
,
.
agp_unmap_page
=
intel_agp_unmap_page
,
.
agp_map_memory
=
intel_agp_map_memory
,
.
agp_unmap_memory
=
intel_agp_unmap_memory
,
#endif
};
};
static
const
struct
agp_bridge_driver
intel_i965_driver
=
{
static
const
struct
agp_bridge_driver
intel_i965_driver
=
{
...
@@ -2034,6 +2165,12 @@ static const struct agp_bridge_driver intel_i965_driver = {
...
@@ -2034,6 +2165,12 @@ static const struct agp_bridge_driver intel_i965_driver = {
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
chipset_flush
=
intel_i915_chipset_flush
,
.
chipset_flush
=
intel_i915_chipset_flush
,
#ifdef USE_PCI_DMA_API
.
agp_map_page
=
intel_agp_map_page
,
.
agp_unmap_page
=
intel_agp_unmap_page
,
.
agp_map_memory
=
intel_agp_map_memory
,
.
agp_unmap_memory
=
intel_agp_unmap_memory
,
#endif
};
};
static
const
struct
agp_bridge_driver
intel_7505_driver
=
{
static
const
struct
agp_bridge_driver
intel_7505_driver
=
{
...
@@ -2088,6 +2225,12 @@ static const struct agp_bridge_driver intel_g33_driver = {
...
@@ -2088,6 +2225,12 @@ static const struct agp_bridge_driver intel_g33_driver = {
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_destroy_pages
=
agp_generic_destroy_pages
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
agp_type_to_mask_type
=
intel_i830_type_to_mask_type
,
.
chipset_flush
=
intel_i915_chipset_flush
,
.
chipset_flush
=
intel_i915_chipset_flush
,
#ifdef USE_PCI_DMA_API
.
agp_map_page
=
intel_agp_map_page
,
.
agp_unmap_page
=
intel_agp_unmap_page
,
.
agp_map_memory
=
intel_agp_map_memory
,
.
agp_unmap_memory
=
intel_agp_unmap_memory
,
#endif
};
};
static
int
find_gmch
(
u16
device
)
static
int
find_gmch
(
u16
device
)
...
@@ -2313,15 +2456,6 @@ static int agp_intel_resume(struct pci_dev *pdev)
...
@@ -2313,15 +2456,6 @@ static int agp_intel_resume(struct pci_dev *pdev)
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
int
ret_val
;
int
ret_val
;
pci_restore_state
(
pdev
);
/* We should restore our graphics device's config space,
* as host bridge (00:00) resumes before graphics device (02:00),
* then our access to its pci space can work right.
*/
if
(
intel_private
.
pcidev
)
pci_restore_state
(
intel_private
.
pcidev
);
if
(
bridge
->
driver
==
&
intel_generic_driver
)
if
(
bridge
->
driver
==
&
intel_generic_driver
)
intel_configure
();
intel_configure
();
else
if
(
bridge
->
driver
==
&
intel_850_driver
)
else
if
(
bridge
->
driver
==
&
intel_850_driver
)
...
...
drivers/char/agp/nvidia-agp.c
View file @
da2e3ac8
...
@@ -225,7 +225,7 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
...
@@ -225,7 +225,7 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
}
}
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
]
,
mask_type
),
page_to_phys
(
mem
->
pages
[
i
])
,
mask_type
),
agp_bridge
->
gatt_table
+
nvidia_private
.
pg_offset
+
j
);
agp_bridge
->
gatt_table
+
nvidia_private
.
pg_offset
+
j
);
}
}
...
...
drivers/char/agp/parisc-agp.c
View file @
da2e3ac8
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#define AGP8X_MODE (1 << AGP8X_MODE_BIT)
#define AGP8X_MODE (1 << AGP8X_MODE_BIT)
static
unsigned
long
static
unsigned
long
parisc_agp_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
addr
,
parisc_agp_mask_memory
(
struct
agp_bridge_data
*
bridge
,
dma_addr_t
addr
,
int
type
);
int
type
);
static
struct
_parisc_agp_info
{
static
struct
_parisc_agp_info
{
...
@@ -189,20 +189,12 @@ parisc_agp_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
...
@@ -189,20 +189,12 @@ parisc_agp_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
}
}
static
unsigned
long
static
unsigned
long
parisc_agp_mask_memory
(
struct
agp_bridge_data
*
bridge
,
unsigned
long
addr
,
parisc_agp_mask_memory
(
struct
agp_bridge_data
*
bridge
,
dma_addr_t
addr
,
int
type
)
int
type
)
{
{
return
SBA_PDIR_VALID_BIT
|
addr
;
return
SBA_PDIR_VALID_BIT
|
addr
;
}
}
static
unsigned
long
parisc_agp_page_mask_memory
(
struct
agp_bridge_data
*
bridge
,
struct
page
*
page
,
int
type
)
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
return
SBA_PDIR_VALID_BIT
|
addr
;
}
static
void
static
void
parisc_agp_enable
(
struct
agp_bridge_data
*
bridge
,
u32
mode
)
parisc_agp_enable
(
struct
agp_bridge_data
*
bridge
,
u32
mode
)
{
{
...
...
drivers/char/agp/sgi-agp.c
View file @
da2e3ac8
...
@@ -70,10 +70,9 @@ static void sgi_tioca_tlbflush(struct agp_memory *mem)
...
@@ -70,10 +70,9 @@ static void sgi_tioca_tlbflush(struct agp_memory *mem)
* entry.
* entry.
*/
*/
static
unsigned
long
static
unsigned
long
sgi_tioca_mask_memory
(
struct
agp_bridge_data
*
bridge
,
sgi_tioca_mask_memory
(
struct
agp_bridge_data
*
bridge
,
dma_addr_t
addr
,
struct
page
*
page
,
int
type
)
int
type
)
{
{
unsigned
long
addr
=
phys_to_gart
(
page_to_phys
(
page
));
return
tioca_physpage_to_gart
(
addr
);
return
tioca_physpage_to_gart
(
addr
);
}
}
...
@@ -190,7 +189,8 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
...
@@ -190,7 +189,8 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
table
[
j
]
=
table
[
j
]
=
bridge
->
driver
->
mask_memory
(
bridge
,
mem
->
pages
[
i
],
bridge
->
driver
->
mask_memory
(
bridge
,
page_to_phys
(
mem
->
pages
[
i
]),
mem
->
type
);
mem
->
type
);
}
}
...
...
drivers/char/agp/sworks-agp.c
View file @
da2e3ac8
...
@@ -155,7 +155,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -155,7 +155,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
/* Create a fake scratch directory */
/* Create a fake scratch directory */
for
(
i
=
0
;
i
<
1024
;
i
++
)
{
for
(
i
=
0
;
i
<
1024
;
i
++
)
{
writel
(
agp_bridge
->
scratch_page
,
serverworks_private
.
scratch_dir
.
remapped
+
i
);
writel
(
agp_bridge
->
scratch_page
,
serverworks_private
.
scratch_dir
.
remapped
+
i
);
writel
(
virt_to_
gart
(
serverworks_private
.
scratch_dir
.
real
)
|
1
,
page_dir
.
remapped
+
i
);
writel
(
virt_to_
phys
(
serverworks_private
.
scratch_dir
.
real
)
|
1
,
page_dir
.
remapped
+
i
);
}
}
retval
=
serverworks_create_gatt_pages
(
value
->
num_entries
/
1024
);
retval
=
serverworks_create_gatt_pages
(
value
->
num_entries
/
1024
);
...
@@ -167,7 +167,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -167,7 +167,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table_real
=
(
u32
*
)
page_dir
.
real
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_table
=
(
u32
__iomem
*
)
page_dir
.
remapped
;
agp_bridge
->
gatt_bus_addr
=
virt_to_
gart
(
page_dir
.
real
);
agp_bridge
->
gatt_bus_addr
=
virt_to_
phys
(
page_dir
.
real
);
/* Get the address for the gart region.
/* Get the address for the gart region.
* This is a bus address even on the alpha, b/c its
* This is a bus address even on the alpha, b/c its
...
@@ -179,7 +179,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -179,7 +179,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
/* Calculate the agp offset */
/* Calculate the agp offset */
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
)
for
(
i
=
0
;
i
<
value
->
num_entries
/
1024
;
i
++
)
writel
(
virt_to_
gart
(
serverworks_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
page_dir
.
remapped
+
i
);
writel
(
virt_to_
phys
(
serverworks_private
.
gatt_pages
[
i
]
->
real
)
|
1
,
page_dir
.
remapped
+
i
);
return
0
;
return
0
;
}
}
...
@@ -349,7 +349,9 @@ static int serverworks_insert_memory(struct agp_memory *mem,
...
@@ -349,7 +349,9 @@ static int serverworks_insert_memory(struct agp_memory *mem,
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
for
(
i
=
0
,
j
=
pg_start
;
i
<
mem
->
page_count
;
i
++
,
j
++
)
{
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
addr
=
(
j
*
PAGE_SIZE
)
+
agp_bridge
->
gart_bus_addr
;
cur_gatt
=
SVRWRKS_GET_GATT
(
addr
);
cur_gatt
=
SVRWRKS_GET_GATT
(
addr
);
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
mem
->
pages
[
i
],
mem
->
type
),
cur_gatt
+
GET_GATT_OFF
(
addr
));
writel
(
agp_bridge
->
driver
->
mask_memory
(
agp_bridge
,
page_to_phys
(
mem
->
pages
[
i
]),
mem
->
type
),
cur_gatt
+
GET_GATT_OFF
(
addr
));
}
}
serverworks_tlbflush
(
mem
);
serverworks_tlbflush
(
mem
);
return
0
;
return
0
;
...
...
drivers/char/agp/uninorth-agp.c
View file @
da2e3ac8
...
@@ -138,7 +138,7 @@ static int uninorth_configure(void)
...
@@ -138,7 +138,7 @@ static int uninorth_configure(void)
if
(
is_u3
)
{
if
(
is_u3
)
{
pci_write_config_dword
(
agp_bridge
->
dev
,
pci_write_config_dword
(
agp_bridge
->
dev
,
UNI_N_CFG_GART_DUMMY_PAGE
,
UNI_N_CFG_GART_DUMMY_PAGE
,
agp_bridge
->
scratch_page_real
>>
12
);
page_to_phys
(
agp_bridge
->
scratch_page_page
)
>>
12
);
}
}
return
0
;
return
0
;
...
@@ -445,7 +445,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
...
@@ -445,7 +445,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
if
(
bridge
->
gatt_table
==
NULL
)
if
(
bridge
->
gatt_table
==
NULL
)
goto
enomem
;
goto
enomem
;
bridge
->
gatt_bus_addr
=
virt_to_
gart
(
table
);
bridge
->
gatt_bus_addr
=
virt_to_
phys
(
table
);
for
(
i
=
0
;
i
<
num_entries
;
i
++
)
for
(
i
=
0
;
i
<
num_entries
;
i
++
)
bridge
->
gatt_table
[
i
]
=
0
;
bridge
->
gatt_table
[
i
]
=
0
;
...
...
include/linux/agp_backend.h
View file @
da2e3ac8
...
@@ -82,6 +82,9 @@ struct agp_memory {
...
@@ -82,6 +82,9 @@ struct agp_memory {
bool
vmalloc_flag
;
bool
vmalloc_flag
;
/* list of agp_memory mapped to the aperture */
/* list of agp_memory mapped to the aperture */
struct
list_head
mapped_list
;
struct
list_head
mapped_list
;
/* DMA-mapped addresses */
struct
scatterlist
*
sg_list
;
int
num_sg
;
};
};
#define AGP_NORMAL_MEMORY 0
#define AGP_NORMAL_MEMORY 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment