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

Commit 95ca5b55 authored by Emil Velikov's avatar Emil Velikov Committed by Ben Skeggs
Browse files

drm/nouveau/fb: use correct ram oclass for nv1a hardware 

commit 8613e731
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Mon Oct 21 08:50:25 2013 +1000

    drm/nouveau/fb: remove ram oclass argument from base fb constructor

Introduced a unfortunate regression by using nv10 ram oclass for nv1a
hardware, causing corruption and eventually system lockup.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74866


Reported-by: default avatarJohn F. Godfrey <jfgodfrey@gmail.com>
Signed-off-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Cc: stable@vger.kernel.org # 3.13+
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a8c13aac

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ nv1a_fb_oclass = &(struct nv04_fb_impl) { 
		.fini = _nouveau_fb_fini,

		.fini = _nouveau_fb_fini,

	},

	},

	.base.memtype = nv04_fb_memtype_valid,

	.base.memtype = nv04_fb_memtype_valid,

	.base.ram = &nv10_ram_oclass,

	.base.ram = &nv1a_ram_oclass,

	.tile.regions = 8,

	.tile.regions = 8,

	.tile.init = nv10_fb_tile_init,

	.tile.init = nv10_fb_tile_init,

	.tile.fini = nv10_fb_tile_fini,

	.tile.fini = nv10_fb_tile_fini,