projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a11dd6
)
drm/nouveau: fix fetching vbios from above 4GiB vram addresses
author
Ben Skeggs
<bskeggs@redhat.com>
Thu, 23 Jun 2011 22:18:23 +0000
(08:18 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Sun, 26 Jun 2011 23:20:04 +0000
(09:20 +1000)
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 ff339df6f0071acbc138c20500cfce73822dd9d7..1aa73d3957e14b0cae406d6f86ab213994491532 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bios.c
@@
-135,13
+135,14
@@
static void load_vbios_pramin(struct drm_device *dev, uint8_t *data)
int i;
if (dev_priv->card_type >= NV_50) {
- uint32_t vbios_vram = (nv_rd32(dev, 0x619f04) & ~0xff) << 8;
-
- if (!vbios_vram)
- vbios_vram = (nv_rd32(dev, 0x1700) << 16) + 0xf0000;
+ u64 addr = (u64)(nv_rd32(dev, 0x619f04) & 0xffffff00) << 8;
+ if (!addr) {
+ addr = (u64)nv_rd32(dev, 0x1700) << 16;
+ addr += 0xf0000;
+ }
old_bar0_pramin = nv_rd32(dev, 0x1700);
- nv_wr32(dev, 0x1700,
vbios_vram
>> 16);
+ nv_wr32(dev, 0x1700,
addr
>> 16);
}
/* bail if no rom signature */
This page took
0.029993 seconds
and
5
git commands to generate.