Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cad16ac authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a7dbf004

drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -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) {