projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bf9b0e
)
drm/nouveau: Fix the INIT_CONFIGURE_PREINIT BIOS opcode.
author
Francisco Jerez
<currojerez@riseup.net>
Wed, 4 Aug 2010 03:15:11 +0000
(
05:15
+0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 5 Aug 2010 22:34:50 +0000
(08:34 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bios.c
b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 66035283546a067acda808a745bb5e4632e7d562..c608b0b29a3680b309369e89bf6f1175874b8bde 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bios.c
@@
-2595,7
+2595,7
@@
init_configure_preinit(struct nvbios *bios, uint16_t offset,
/* no iexec->execute check by design */
uint32_t straps = bios_rd32(bios, NV_PEXTDEV_BOOT_0);
- uint8_t cr3c = ((straps << 2) & 0xf0) | (straps &
(1 << 6))
;
+ uint8_t cr3c = ((straps << 2) & 0xf0) | (straps &
0x40) >> 6
;
if (bios->major_version > 2)
return 0;