From: Karol Herbst <kherbst@redhat.com>
Date: Mon, 18 Jan 2021 17:16:06 +0000 (+0100)
Subject: drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~363^2~2000
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=112821f254b6f2d4a0f8e6a39f93cf0db62f95fb;p=linux.git

drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices

commit dcd602cc5fe2803bf532d407cde24ba0b7808ff3 upstream.

Fixes a crash when trying to create a channel on e.g. Turing GPUs when
NOUVEAU_SVM_INIT was called before.

Fixes: eeaf06ac1a558 ("drm/nouveau/svm: initial support for shared virtual memory")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 4f69e4c3dafd..1c3f890377d2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -315,6 +315,10 @@ nouveau_svmm_init(struct drm_device *dev, void *data,
 	struct drm_nouveau_svm_init *args = data;
 	int ret;
 
+	/* We need to fail if svm is disabled */
+	if (!cli->drm->svm)
+		return -ENOSYS;
+
 	/* Allocate tracking for SVM-enabled VMM. */
 	if (!(svmm = kzalloc(sizeof(*svmm), GFP_KERNEL)))
 		return -ENOMEM;