Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b554b12a authored by Thierry Reding's avatar Thierry Reding Committed by Ben Skeggs
Browse files

drm/nouveau/drm/nouveau: Pass the proper arguments to nvif_object_map_handle() 



This is obviously wrong in the current code. Make sure to record the
correct size of the arguments and pass the actual arguments to the
nvif_object_map_handle() function.

Suggested-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1b5c7ef3

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −1
Original line number Diff line number Diff line
@@ -1447,11 +1447,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) 
				args.nv50.ro = 0;

				args.nv50.kind = mem->kind;

				args.nv50.comp = mem->comp;

				argc = sizeof(args.nv50);

				break;

			case NVIF_CLASS_MEM_GF100:

				args.gf100.version = 0;

				args.gf100.ro = 0;

				args.gf100.kind = mem->kind;

				argc = sizeof(args.gf100);

				break;

			default:

				WARN_ON(1);
@@ -1459,7 +1461,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) 
			}



			ret = nvif_object_map_handle(&mem->mem.object,

						     &argc, argc,

						     &args, argc,

						     &handle, &length);

			if (ret != 1)

				return ret ? ret : -EINVAL;