]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau/bar/nv50: check bar1 vmm return value
authorJon Derrick <jonathan.derrick@intel.com>
Sat, 16 Mar 2019 00:05:15 +0000 (18:05 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:21:37 +0000 (08:21 +0100)
commit 307a312df9c43fdea286ad17f748aaf777cc434a upstream.

Check bar1's new vmm creation return value for errors.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sushma Kalakota <sushmax.kalakota@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c

index 38c9c086754b689698950e44b801b38ed7fc671d..f23a0ccc2becca6d733089941d4850d3b410d567 100644 (file)
@@ -174,6 +174,8 @@ nv50_bar_oneinit(struct nvkm_bar *base)
 
        ret = nvkm_vmm_new(device, start, limit-- - start, NULL, 0,
                           &bar1_lock, "bar1", &bar->bar1_vmm);
+       if (ret)
+               return ret;
 
        atomic_inc(&bar->bar1_vmm->engref[NVKM_SUBDEV_BAR]);
        bar->bar1_vmm->debug = bar->base.subdev.debug;