Commit 212872bf authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Fix silly logic bug in AGPx8 ->x4 fallback code.

Spotted by Rainer Klier
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent dfc908c2
...@@ -461,13 +461,13 @@ static void agp_v3_parse_one(u32 *mode, u32 *cmd, u32 *tmp) ...@@ -461,13 +461,13 @@ static void agp_v3_parse_one(u32 *mode, u32 *cmd, u32 *tmp)
if (*mode & AGPSTAT3_8X) { if (*mode & AGPSTAT3_8X) {
if (!(*cmd & AGPSTAT3_8X)) { if (!(*cmd & AGPSTAT3_8X)) {
*cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); *cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
*cmd |= ~AGPSTAT3_4X; *cmd |= AGPSTAT3_4X;
printk ("%s requested AGPx8 but bridge not capable.\n", current->comm); printk ("%s requested AGPx8 but bridge not capable.\n", current->comm);
return; return;
} }
if (!(*tmp & AGPSTAT3_8X)) { if (!(*tmp & AGPSTAT3_8X)) {
*cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); *cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
*cmd |= ~AGPSTAT3_4X; *cmd |= AGPSTAT3_4X;
printk ("%s requested AGPx8 but graphic card not capable.\n", current->comm); printk ("%s requested AGPx8 but graphic card not capable.\n", current->comm);
return; return;
} }
...@@ -484,7 +484,7 @@ static void agp_v3_parse_one(u32 *mode, u32 *cmd, u32 *tmp) ...@@ -484,7 +484,7 @@ static void agp_v3_parse_one(u32 *mode, u32 *cmd, u32 *tmp)
*/ */
*cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD); *cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
if ((*cmd & AGPSTAT3_4X) && (*tmp & AGPSTAT3_4X)) if ((*cmd & AGPSTAT3_4X) && (*tmp & AGPSTAT3_4X))
*cmd |= ~AGPSTAT3_4X; *cmd |= AGPSTAT3_4X;
else { else {
printk (KERN_INFO PFX "Badness. Don't know which AGP mode to set. " printk (KERN_INFO PFX "Badness. Don't know which AGP mode to set. "
"[cmd:%x tmp:%x fell back to:- cmd:%x tmp:%x]\n", "[cmd:%x tmp:%x fell back to:- cmd:%x tmp:%x]\n",
......
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