Patch "drm/nouveau/device: return error for unknown chipsets" has been added to the 5.8-stable tree

gregkh at linuxfoundation.org gregkh at linuxfoundation.org
Fri Oct 9 07:33:45 UTC 2020


This is a note to let you know that I've just added the patch titled

    drm/nouveau/device: return error for unknown chipsets

to the 5.8-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-device-return-error-for-unknown-chipsets.patch
and it can be found in the queue-5.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From c3e0276c31ca8c7b8615da890727481260d4676f Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst at redhat.com>
Date: Wed, 7 Oct 2020 00:05:27 +0200
Subject: drm/nouveau/device: return error for unknown chipsets

From: Karol Herbst <kherbst at redhat.com>

commit c3e0276c31ca8c7b8615da890727481260d4676f upstream.

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 at redhat.com>
Cc: dann frazier <dann.frazier at canonical.com>
Cc: dri-devel <dri-devel at lists.freedesktop.org>
Cc: Dave Airlie <airlied at redhat.com>
Cc: stable at vger.kernel.org
Reviewed-by: Jeremy Cline <jcline at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

---
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c |    1 +
 1 file changed, 1 insertion(+)

--- 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_devic
 		case 0x168: device->chip = &nv168_chipset; break;
 		default:
 			nvdev_error(device, "unknown chipset (%08x)\n", boot0);
+			ret = -ENODEV;
 			goto done;
 		}
 


Patches currently in stable-queue which might be from kherbst at redhat.com are

queue-5.8/drm-nouveau-device-return-error-for-unknown-chipsets.patch
queue-5.8/drm-nouveau-mem-guard-against-null-pointer-access-in-mem_del.patch


More information about the dri-devel mailing list