Commit e444de56 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/falcon: protect against concurrent DMEM accesses 



The falcon library may be used concurrently, especially after the
introduction of the msgqueue interface. Make it safe to use it that way.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6bd4b523

drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ struct nvkm_falcon { 
	u32 addr;



	struct mutex mutex;

	struct mutex dmem_mutex;

	const struct nvkm_subdev *user;



	u8 version;

drivers/gpu/drm/nouveau/nvkm/falcon/base.c

+9 −0
Original line number Diff line number Diff line
@@ -41,14 +41,22 @@ void 
nvkm_falcon_load_dmem(struct nvkm_falcon *falcon, void *data, u32 start,

		      u32 size, u8 port)

{

	mutex_lock(&falcon->dmem_mutex);



	falcon->func->load_dmem(falcon, data, start, size, port);



	mutex_unlock(&falcon->dmem_mutex);

}



void

nvkm_falcon_read_dmem(struct nvkm_falcon *falcon, u32 start, u32 size, u8 port,

		      void *data)

{

	mutex_lock(&falcon->dmem_mutex);



	falcon->func->read_dmem(falcon, start, size, port, data);



	mutex_unlock(&falcon->dmem_mutex);

}



void
@@ -166,6 +174,7 @@ nvkm_falcon_ctor(const struct nvkm_falcon_func *func, 
	falcon->name = name;

	falcon->addr = addr;

	mutex_init(&falcon->mutex);

	mutex_init(&falcon->dmem_mutex);



	reg = nvkm_falcon_rd32(falcon, 0x12c);

	falcon->version = reg & 0xf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE