Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f6fd6a01
Commit
f6fd6a01
authored
Jan 07, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-dj.bkbits.net/agpgart
into home.osdl.org:/home/torvalds/v2.5/linux
parents
18041d80
e33e8761
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
drivers/char/agp/ati-agp.c
drivers/char/agp/ati-agp.c
+4
-4
No files found.
drivers/char/agp/ati-agp.c
View file @
f6fd6a01
...
...
@@ -151,7 +151,7 @@ static int ati_fetch_size(void)
u32
temp
;
struct
aper_size_info_lvl2
*
values
;
if
(
is_r200
)
if
(
is_r200
()
)
pci_read_config_dword
(
agp_bridge
->
dev
,
ATI_RS100_APSIZE
,
&
temp
);
else
pci_read_config_dword
(
agp_bridge
->
dev
,
ATI_RS300_APSIZE
,
&
temp
);
...
...
@@ -184,7 +184,7 @@ static void ati_cleanup(void)
previous_size
=
A_SIZE_LVL2
(
agp_bridge
->
previous_size
);
/* Write back the previous size and disable gart translation */
if
(
is_r200
)
{
if
(
is_r200
()
)
{
pci_read_config_dword
(
agp_bridge
->
dev
,
ATI_RS100_APSIZE
,
&
temp
);
temp
=
((
temp
&
~
(
0x0000000f
))
|
previous_size
->
size_value
);
pci_write_config_dword
(
agp_bridge
->
dev
,
ATI_RS100_APSIZE
,
temp
);
...
...
@@ -206,7 +206,7 @@ static int ati_configure(void)
temp
=
(
temp
&
0xfffff000
);
ati_generic_private
.
registers
=
(
volatile
u8
*
)
ioremap
(
temp
,
4096
);
if
(
is_r200
)
if
(
is_r200
()
)
pci_write_config_dword
(
agp_bridge
->
dev
,
ATI_RS100_IG_AGPMODE
,
0x20000
);
else
pci_write_config_dword
(
agp_bridge
->
dev
,
ATI_RS300_IG_AGPMODE
,
0x20000
);
...
...
@@ -333,7 +333,7 @@ static int ati_create_gatt_table(void)
/* Write out the size register */
current_size
=
A_SIZE_LVL2
(
agp_bridge
->
current_size
);
if
(
is_r200
)
{
if
(
is_r200
()
)
{
pci_read_config_dword
(
agp_bridge
->
dev
,
ATI_RS100_APSIZE
,
&
temp
);
temp
=
(((
temp
&
~
(
0x0000000e
))
|
current_size
->
size_value
)
|
0x00000001
);
...
...
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