OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7dbf00
)
drm/nv50/fb: prevent oops on chipsets without compression tags
author
Ben Skeggs
<bskeggs@redhat.com>
Wed, 31 Oct 2012 00:51:00 +0000
(10:51 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Wed, 31 Oct 2012 01:23:23 +0000
(11:23 +1000)
Unconditionally create the tagram mm, even if there's zero tags.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
index
27fb1af
..
5f57080
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
+++ b/
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@
-219,13
+219,11
@@
nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
((priv->base.ram.size & 0x000000ff) << 32);
tags = nv_rd32(priv, 0x100320);
- if (tags) {
- ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1);
- if (ret)
- return ret;
+ ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1);
+ if (ret)
+ return ret;
- nv_debug(priv, "%d compression tags\n", tags);
- }
+ nv_debug(priv, "%d compression tags\n", tags);
size = (priv->base.ram.size >> 12) - rsvd_head - rsvd_tail;
switch (device->chipset) {