On Tue, 2013-05-21 at 19:24 -0700, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > The patch below does not apply to the 3.9-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. Hm, weird. I just cherry-picked the commit into a branch based off of stable/linux-3.9.y and it applied without issue? Ben. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 6d5f83834dc2b064b8c1202ea281820286b675a8 Mon Sep 17 00:00:00 2001 > From: Ben Skeggs <bskeggs@xxxxxxxxxx> > Date: Mon, 13 May 2013 16:11:12 +1000 > Subject: [PATCH] drm/nvc0/ce: disable ce1 on a number of chipsets > > The falcon is present, but the rest of the copy engine doesn't appear to > be... PUNITS doesn't report disabled (maybe the bits for the copy engines > got added later?), so we end up trying to use a non-functional CE1, and > bust all sorts of things.. Most notably, suspend/resume.. > > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx> > > diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c > index 955af12..a36e64e 100644 > --- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c > +++ b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c > @@ -138,7 +138,6 @@ nvc0_identify(struct nouveau_device *device) > device->oclass[NVDEV_ENGINE_BSP ] = &nvc0_bsp_oclass; > device->oclass[NVDEV_ENGINE_PPP ] = &nvc0_ppp_oclass; > device->oclass[NVDEV_ENGINE_COPY0 ] = &nvc0_copy0_oclass; > - device->oclass[NVDEV_ENGINE_COPY1 ] = &nvc0_copy1_oclass; > device->oclass[NVDEV_ENGINE_DISP ] = &nva3_disp_oclass; > break; > case 0xce: > @@ -225,7 +224,6 @@ nvc0_identify(struct nouveau_device *device) > device->oclass[NVDEV_ENGINE_BSP ] = &nvc0_bsp_oclass; > device->oclass[NVDEV_ENGINE_PPP ] = &nvc0_ppp_oclass; > device->oclass[NVDEV_ENGINE_COPY0 ] = &nvc0_copy0_oclass; > - device->oclass[NVDEV_ENGINE_COPY1 ] = &nvc0_copy1_oclass; > device->oclass[NVDEV_ENGINE_DISP ] = &nva3_disp_oclass; > break; > case 0xc8: > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html