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
d30f2db2
Commit
d30f2db2
authored
Jun 04, 2003
by
Dave Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AGPGART] Missing printk levels.
parent
99e64760
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
drivers/char/agp/intel-agp.c
drivers/char/agp/intel-agp.c
+3
-3
drivers/char/agp/sworks-agp.c
drivers/char/agp/sworks-agp.c
+7
-8
No files found.
drivers/char/agp/intel-agp.c
View file @
d30f2db2
...
@@ -447,7 +447,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start,
...
@@ -447,7 +447,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start,
printk
(
KERN_DEBUG
"pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x
\n
"
,
printk
(
KERN_DEBUG
"pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x
\n
"
,
pg_start
,
intel_i830_private
.
gtt_entries
);
pg_start
,
intel_i830_private
.
gtt_entries
);
printk
(
"Trying to insert into local/stolen memory
\n
"
);
printk
(
KERN_INFO
PFX
"Trying to insert into local/stolen memory
\n
"
);
return
(
-
EINVAL
);
return
(
-
EINVAL
);
}
}
...
@@ -483,7 +483,7 @@ static int intel_i830_remove_entries(struct agp_memory *mem,off_t pg_start,
...
@@ -483,7 +483,7 @@ static int intel_i830_remove_entries(struct agp_memory *mem,off_t pg_start,
global_cache_flush
();
global_cache_flush
();
if
(
pg_start
<
intel_i830_private
.
gtt_entries
)
{
if
(
pg_start
<
intel_i830_private
.
gtt_entries
)
{
printk
(
"Trying to disable local/stolen memory
\n
"
);
printk
(
KERN_INFO
PFX
"Trying to disable local/stolen memory
\n
"
);
return
(
-
EINVAL
);
return
(
-
EINVAL
);
}
}
...
@@ -645,7 +645,7 @@ static int intel_815_configure(void)
...
@@ -645,7 +645,7 @@ static int intel_815_configure(void)
/* the Intel 815 chipset spec. says that bits 29-31 in the
/* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */
* ATTBASE register are reserved -> try not to write them */
if
(
agp_bridge
->
gatt_bus_addr
&
INTEL_815_ATTBASE_MASK
)
{
if
(
agp_bridge
->
gatt_bus_addr
&
INTEL_815_ATTBASE_MASK
)
{
printk
(
KERN_EMERG
"gatt bus addr too high"
);
printk
(
KERN_EMERG
PFX
"gatt bus addr too high"
);
return
-
EINVAL
;
return
-
EINVAL
;
}
}
...
...
drivers/char/agp/sworks-agp.c
View file @
d30f2db2
...
@@ -240,7 +240,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
...
@@ -240,7 +240,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
while
(
INREG8
(
serverworks_private
.
registers
,
while
(
INREG8
(
serverworks_private
.
registers
,
SVWRKS_POSTFLUSH
)
==
0x01
)
{
SVWRKS_POSTFLUSH
)
==
0x01
)
{
if
((
signed
)(
end
-
jiffies
)
<=
0
)
{
if
((
signed
)(
end
-
jiffies
)
<=
0
)
{
printk
(
KERN_ERR
"Posted write buffer flush took more"
printk
(
KERN_ERR
PFX
"Posted write buffer flush took more"
"then 3 seconds
\n
"
);
"then 3 seconds
\n
"
);
}
}
}
}
...
@@ -249,7 +249,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
...
@@ -249,7 +249,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
while
(
INREG32
(
serverworks_private
.
registers
,
while
(
INREG32
(
serverworks_private
.
registers
,
SVWRKS_DIRFLUSH
)
==
0x00000001
)
{
SVWRKS_DIRFLUSH
)
==
0x00000001
)
{
if
((
signed
)(
end
-
jiffies
)
<=
0
)
{
if
((
signed
)(
end
-
jiffies
)
<=
0
)
{
printk
(
KERN_ERR
"TLB flush took more"
printk
(
KERN_ERR
PFX
"TLB flush took more"
"then 3 seconds
\n
"
);
"then 3 seconds
\n
"
);
}
}
}
}
...
@@ -447,8 +447,7 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
...
@@ -447,8 +447,7 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
PCI_DEVFN
(
0
,
1
));
PCI_DEVFN
(
0
,
1
));
if
(
!
bridge_dev
)
{
if
(
!
bridge_dev
)
{
printk
(
KERN_INFO
PFX
"agpgart: Detected a Serverworks "
printk
(
KERN_INFO
PFX
"agpgart: Detected a Serverworks "
"Chipset, but could not find the secondary "
"Chipset, but could not find the secondary device.
\n
"
);
"device.
\n
"
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
...
@@ -470,8 +469,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
...
@@ -470,8 +469,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
if
(
temp
&
PCI_BASE_ADDRESS_MEM_TYPE_64
)
{
if
(
temp
&
PCI_BASE_ADDRESS_MEM_TYPE_64
)
{
pci_read_config_dword
(
pdev
,
SVWRKS_APSIZE
+
4
,
&
temp2
);
pci_read_config_dword
(
pdev
,
SVWRKS_APSIZE
+
4
,
&
temp2
);
if
(
temp2
!=
0
)
{
if
(
temp2
!=
0
)
{
printk
(
"Detected 64 bit aperture address, but top
"
printk
(
KERN_INFO
PFX
"Detected 64 bit aperture address,
"
"bits are not zero. Disabling agp
\n
"
);
"b
ut top b
its are not zero. Disabling agp
\n
"
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
serverworks_private
.
mm_addr_ofs
=
0x18
;
serverworks_private
.
mm_addr_ofs
=
0x18
;
...
@@ -483,8 +482,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
...
@@ -483,8 +482,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
pci_read_config_dword
(
pdev
,
pci_read_config_dword
(
pdev
,
serverworks_private
.
mm_addr_ofs
+
4
,
&
temp2
);
serverworks_private
.
mm_addr_ofs
+
4
,
&
temp2
);
if
(
temp2
!=
0
)
{
if
(
temp2
!=
0
)
{
printk
(
"Detected 64 bit MMIO address, but top
"
printk
(
KERN_INFO
PFX
"Detected 64 bit MMIO address,
"
"bits are not zero. Disabling agp
\n
"
);
"b
ut top b
its are not zero. Disabling agp
\n
"
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
}
}
...
...
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