Commit 3d006ee4 authored Oct 08, 2020 by Linus Torvalds

Merge tag 'drm-fixes-2020-10-08' of git://anongit.freedesktop.org/drm/drm

Pull drm nouveau fixes from Dave Airlie:
 "Karol found two last minute nouveau fixes, they both fix crashes, the
  TTM one follows what other drivers do already, and the other is for
  bailing on load on unrecognised chipsets.

   - fix crash in TTM alloc fail path

   - return error earlier for unknown chipsets"

* tag 'drm-fixes-2020-10-08' of git://anongit.freedesktop.org/drm/drm:
  drm/nouveau/mem: guard against NULL pointer access in mem_del
  drm/nouveau/device: return error for unknown chipsets

parents b9e3aa2a d10285a2

drivers/gpu/drm/nouveau/nouveau_mem.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,8 @@ void
		nouveau_mem_del(struct ttm_mem_reg *reg)
		{
		struct nouveau_mem *mem = nouveau_mem(reg);
		if (!mem)
		return;
		nouveau_mem_fini(mem);
		kfree(reg->mm_node);
		reg->mm_node = NULL;

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message