[PATCH AUTOSEL 4.14 2/8] drm/nouveau: make sure ret is initialized in nouveau_ttm_io_mem_reserve

Sasha Levin sashal at kernel.org
Sat Dec 12 16:08:53 UTC 2020


From: Christian König <christian.koenig at amd.com>

[ Upstream commit aea656b0d05ec5b8ed5beb2f94c4dd42ea834e9d ]

This wasn't initialized for pre NV50 hardware.

Signed-off-by: Christian König <christian.koenig at amd.com>
Reported-and-Tested-by: Mark Hounschell <markh at compro.net>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Link: https://patchwork.freedesktop.org/series/84298/
Signed-off-by: Sasha Levin <sashal at kernel.org>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index e427f80344c4d..fddbe66935464 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1375,6 +1375,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
 			nvkm_vm_map(&mem->bar_vma, mem);
 			reg->bus.offset = mem->bar_vma.offset;
 		}
+		ret = 0;
 		break;
 	default:
 		return -EINVAL;
-- 
2.27.0



More information about the dri-devel mailing list