| Message ID | 1392169302-8155-1-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 12, 2014 at 11:41 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > 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> > Cc: stable@vger.kernel.org # 3.13+ Thanks :) > --- > drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c > index 9159a5c..265d125 100644 > --- 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, > -- > 1.8.5.4 > > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c index 9159a5c..265d125 100644 --- 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,
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> Cc: stable@vger.kernel.org # 3.13+ --- drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)