| From 95ca5b550ac255bf3cee108c123407785c47e3cc Mon Sep 17 00:00:00 2001 |
| From: Emil Velikov <emil.l.velikov@gmail.com> |
| Date: Wed, 12 Feb 2014 01:41:42 +0000 |
| Subject: drm/nouveau/fb: use correct ram oclass for nv1a hardware |
| |
| From: Emil Velikov <emil.l.velikov@gmail.com> |
| |
| commit 95ca5b550ac255bf3cee108c123407785c47e3cc upstream. |
| |
| commit 8613e7314ac254fdd67ed46192f021d76141e4c9 |
| 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: John F. Godfrey <jfgodfrey@gmail.com> |
| Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c |
| +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c |
| @@ -36,7 +36,7 @@ nv1a_fb_oclass = &(struct nv04_fb_impl) |
| .fini = _nouveau_fb_fini, |
| }, |
| .base.memtype = nv04_fb_memtype_valid, |
| - .base.ram = &nv10_ram_oclass, |
| + .base.ram = &nv1a_ram_oclass, |
| .tile.regions = 8, |
| .tile.init = nv10_fb_tile_init, |
| .tile.fini = nv10_fb_tile_fini, |
