diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-08-03 23:15:11 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-05 18:34:50 -0400 |
| commit | 3c9b25349e8fd6e29c4e8298dc08fb052f45a18b (patch) | |
| tree | c70ac55107664de44b05d4bd76018be626dca9b5 /drivers/gpu/drm/nouveau/nouveau_bios.c | |
| parent | 0bf9b0e0ce9140c200c0db67a0c71983f07e1a65 (diff) | |
drm/nouveau: Fix the INIT_CONFIGURE_PREINIT BIOS opcode.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 66035283546..c608b0b29a3 100644 --- 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, | |||
| 2595 | /* no iexec->execute check by design */ | 2595 | /* no iexec->execute check by design */ |
| 2596 | 2596 | ||
| 2597 | uint32_t straps = bios_rd32(bios, NV_PEXTDEV_BOOT_0); | 2597 | uint32_t straps = bios_rd32(bios, NV_PEXTDEV_BOOT_0); |
| 2598 | uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6)); | 2598 | uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & 0x40) >> 6; |
| 2599 | 2599 | ||
| 2600 | if (bios->major_version > 2) | 2600 | if (bios->major_version > 2) |
| 2601 | return 0; | 2601 | return 0; |