openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nv50/fb: prevent oops on chipsets without compression tags 

Unconditionally create the tagram mm, even if there's zero tags.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-10-31 10:51:00 +10:00
parent a7dbf00433
commit 5cad16acd2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
View File

@ -219,13 +219,11 @@ nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
((priv->base.ram.size & 0x000000ff) << 32); ((priv->base.ram.size & 0x000000ff) << 32);
tags = nv_rd32(priv, 0x100320); tags = nv_rd32(priv, 0x100320);
if (tags) { ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1);
ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1); if (ret)
if (ret) return 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; size = (priv->base.ram.size >> 12) - rsvd_head - rsvd_tail;
switch (device->chipset) { switch (device->chipset) {