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

From: Christian König
Date: Mon Dec 14 2020 - 04:51:21 EST


Hi Sasha,

please don't apply this patch to any older kernel.

The fix was only needed for a patch which went in with the 5.10 pull request.

Thanks,
Christian.

Am 12.12.20 um 17:08 schrieb Sasha Levin:
From: Christian König <christian.koenig@xxxxxxx>

[ Upstream commit aea656b0d05ec5b8ed5beb2f94c4dd42ea834e9d ]

This wasn't initialized for pre NV50 hardware.

Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Reported-and-Tested-by: Mark Hounschell <markh@xxxxxxxxxx>
Reviewed-by: Karol Herbst <kherbst@xxxxxxxxxx>
Link: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.freedesktop.org%2Fseries%2F84298%2F&amp;data=04%7C01%7Cchristian.koenig%40amd.com%7C664e6201322444b319e908d89eb83eda%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637433861463180140%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=OQ2BSmlDxz%2BPGq6aDpQBaXjQgO0wdt6y6KlCzIIFVso%3D&amp;reserved=0
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
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;