]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/nouveau/secboot: remove unused hook
authorAlexandre Courbot <acourbot@nvidia.com>
Fri, 16 Dec 2016 09:00:44 +0000 (18:00 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 7 Mar 2017 07:05:11 +0000 (17:05 +1000)
Remove a leftover that became obsolete with the falcon interface.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c

index 97795b342b6f1c7012a7f7ad724e1068f5aa7504..58eb20a69e9c896088f9b7415b484a6cdc4753a3 100644 (file)
@@ -41,8 +41,6 @@ struct nvkm_acr_func {
                    struct nvkm_gpuobj *, u64);
        int (*reset)(struct nvkm_acr *, struct nvkm_secboot *,
                     enum nvkm_secboot_falcon);
-       int (*start)(struct nvkm_acr *, struct nvkm_secboot *,
-                    enum nvkm_secboot_falcon);
 };
 
 /**
index 1aa37ea18580bd5108411d11627d7b0ec359d348..b1e56523757584d392a26bb21b03f1a75121bca0 100644 (file)
@@ -823,32 +823,6 @@ acr_r352_reset(struct nvkm_acr *_acr, struct nvkm_secboot *sb,
        return 0;
 }
 
-static int
-acr_r352_start(struct nvkm_acr *_acr, struct nvkm_secboot *sb,
-                   enum nvkm_secboot_falcon falcon)
-{
-       struct acr_r352 *acr = acr_r352(_acr);
-       const struct nvkm_subdev *subdev = &sb->subdev;
-       int base;
-
-       switch (falcon) {
-       case NVKM_SECBOOT_FALCON_FECS:
-               base = 0x409000;
-               break;
-       case NVKM_SECBOOT_FALCON_GPCCS:
-               base = 0x41a000;
-               break;
-       default:
-               nvkm_error(subdev, "cannot start unhandled falcon!\n");
-               return -EINVAL;
-       }
-
-       nvkm_wr32(subdev->device, base + 0x130, 0x00000002);
-       acr->falcon_state[falcon] = RUNNING;
-
-       return 0;
-}
-
 static int
 acr_r352_fini(struct nvkm_acr *_acr, struct nvkm_secboot *sb, bool suspend)
 {
@@ -906,7 +880,6 @@ acr_r352_base_func = {
        .fini = acr_r352_fini,
        .load = acr_r352_load,
        .reset = acr_r352_reset,
-       .start = acr_r352_start,
 };
 
 struct nvkm_acr *