| Message ID | 20201008124351.1405996-1-dann.frazier@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Groovy] drm/nouveau/device: return error for unknown chipsets | expand |
On 08.10.20 14:43, dann frazier wrote: > From: Karol Herbst <kherbst@redhat.com> > > BugLink: https://bugs.launchpad.net/bugs/1898130 > > Previously the code relied on device->pri to be NULL and to fail probing > later. We really should just return an error inside nvkm_device_ctor for > unsupported GPUs. > > Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map") > > Signed-off-by: Karol Herbst <kherbst@redhat.com> > Cc: dann frazier <dann.frazier@canonical.com> > Cc: dri-devel <dri-devel@lists.freedesktop.org> > Cc: Dave Airlie <airlied@redhat.com> > Cc: stable@vger.kernel.org > Reviewed-by: Jeremy Cline <jcline@redhat.com> > Signed-off-by: Dave Airlie <airlied@redhat.com> > Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com > (cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next) > Signed-off-by: dann frazier <dann.frazier@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > index 5b90c2a1bf3d..7c2e5db840be 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, > case 0x168: device->chip = &nv168_chipset; break; > default: > nvdev_error(device, "unknown chipset (%08x)\n", boot0); > + ret = -ENODEV; > goto done; > } > >
On Thu, Oct 08, 2020 at 06:43:51AM -0600, dann frazier wrote: > From: Karol Herbst <kherbst@redhat.com> > > BugLink: https://bugs.launchpad.net/bugs/1898130 > > Previously the code relied on device->pri to be NULL and to fail probing > later. We really should just return an error inside nvkm_device_ctor for > unsupported GPUs. > > Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map") > > Signed-off-by: Karol Herbst <kherbst@redhat.com> > Cc: dann frazier <dann.frazier@canonical.com> > Cc: dri-devel <dri-devel@lists.freedesktop.org> > Cc: Dave Airlie <airlied@redhat.com> > Cc: stable@vger.kernel.org > Reviewed-by: Jeremy Cline <jcline@redhat.com> > Signed-off-by: Dave Airlie <airlied@redhat.com> > Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com > (cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next) > Signed-off-by: dann frazier <dann.frazier@canonical.com> Applied to groovy/master-next and unstable/master, thanks!
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 5b90c2a1bf3d..7c2e5db840be 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, case 0x168: device->chip = &nv168_chipset; break; default: nvdev_error(device, "unknown chipset (%08x)\n", boot0); + ret = -ENODEV; goto done; }