Hi Greg, This patch appears to have misapplied. I'm not sure why cherry-pick got it wrong, but this is meant to go in the nv4a_chipset definition, not nv44_chipset. This comment also applies to the 4.4 and 4.11 cherry-picks you just did. Thanks, -ilia On Mon, May 22, 2017 at 1:04 PM, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > This is a note to let you know that I've just added the patch titled > > drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one > > to the 4.9-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch > and it can be found in the queue-4.9 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From ac799acaa4d8db4f7dcd968b15c9596c80a4677f Mon Sep 17 00:00:00 2001 > From: Ilia Mirkin <imirkin@xxxxxxxxxxxx> > Date: Sat, 18 Mar 2017 16:23:10 -0400 > Subject: drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one > > From: Ilia Mirkin <imirkin@xxxxxxxxxxxx> > > commit ac799acaa4d8db4f7dcd968b15c9596c80a4677f upstream. > > The NV4A (aka NV44A) is an oddity in the family. It only comes in AGP > and PCI varieties, rather than a core PCIE chip with a bridge for > AGP/PCI as necessary. As a result, it appears that the MMU is also > non-functional. For AGP cards, the vast majority of the NV4A lineup, > this worked out since we force AGP cards to use the nv04 mmu. However > for PCI variants, this did not work. > > Switching to the NV04 MMU makes it work like a charm. Thanks to mwk for > the suggestion. This should be a no-op for NV4A AGP boards, as they were > using it already. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388 > Signed-off-by: Ilia Mirkin <imirkin@xxxxxxxxxxxx> > Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -584,7 +584,7 @@ nv44_chipset = { > .i2c = nv04_i2c_new, > .imem = nv40_instmem_new, > .mc = nv44_mc_new, > - .mmu = nv44_mmu_new, > + .mmu = nv04_mmu_new, > .pci = nv40_pci_new, > .therm = nv40_therm_new, > .timer = nv41_timer_new, > > > Patches currently in stable-queue which might be from imirkin@xxxxxxxxxxxx are > > queue-4.9/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch