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

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

drm/nouveau/secboot: fix functions definitions 



These functions should use the nvkm_secboot_falcon enum. Fix this.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h

+3 −3
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ struct nvkm_secboot { 
#define nvkm_secboot(p) container_of((p), struct nvkm_secboot, subdev)



bool nvkm_secboot_is_managed(struct nvkm_secboot *, enum nvkm_secboot_falcon);

int nvkm_secboot_reset(struct nvkm_secboot *, u32 falcon);

int nvkm_secboot_start(struct nvkm_secboot *, u32 falcon);

int nvkm_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);

int nvkm_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);



int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ nvkm_secboot_falcon_run(struct nvkm_secboot *sb) 
 * nvkm_secboot_reset() - reset specified falcon

 */

int

nvkm_secboot_reset(struct nvkm_secboot *sb, u32 falcon)

nvkm_secboot_reset(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)

{

	/* Unmanaged falcon? */

	if (!(BIT(falcon) & sb->func->managed_falcons)) {
@@ -175,7 +175,7 @@ nvkm_secboot_reset(struct nvkm_secboot *sb, u32 falcon) 
 * nvkm_secboot_start() - start specified falcon

 */

int

nvkm_secboot_start(struct nvkm_secboot *sb, u32 falcon)

nvkm_secboot_start(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)

{

	/* Unmanaged falcon? */

	if (!(BIT(falcon) & sb->func->managed_falcons)) {

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ struct gm200_secboot_func { 


int gm200_secboot_init(struct nvkm_secboot *);

void *gm200_secboot_dtor(struct nvkm_secboot *);

int gm200_secboot_reset(struct nvkm_secboot *, u32);

int gm200_secboot_start(struct nvkm_secboot *, u32);

int gm200_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);

int gm200_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);



int gm20x_secboot_prepare_blobs(struct gm200_secboot *);