drm/nouveau/secboot: pass max supported FW version to LS load funcs

[linux.git] / drivers / gpu / drm / nouveau / nvkm / subdev / secboot / ls_ucode_gr.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c
index 1b0c793c0192b940103701142e5561ffb1b5263a..821d3b2bdb1fa7503785d4b74d511b96dac8c1d4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c
@@ -90,30 +90,30 @@ ls_ucode_img_build(const struct firmware *bl, const struct firmware *code,
  * blob. Also generate the corresponding ucode descriptor.
  */
 static int
-ls_ucode_img_load_gr(const struct nvkm_subdev *subdev, struct ls_ucode_img *img,
-                    const char *falcon_name)
+ls_ucode_img_load_gr(const struct nvkm_subdev *subdev, int maxver,
+                    struct ls_ucode_img *img, const char *falcon_name)
 {
        const struct firmware *bl, *code, *data, *sig;
        char f[64];
        int ret;
 
        snprintf(f, sizeof(f), "gr/%s_bl", falcon_name);
-       ret = nvkm_firmware_get(subdev->device, f, &bl);
+       ret = nvkm_firmware_get(subdev, f, &bl);
        if (ret)
                goto error;
 
        snprintf(f, sizeof(f), "gr/%s_inst", falcon_name);
-       ret = nvkm_firmware_get(subdev->device, f, &code);
+       ret = nvkm_firmware_get(subdev, f, &code);
        if (ret)
                goto free_bl;
 
        snprintf(f, sizeof(f), "gr/%s_data", falcon_name);
-       ret = nvkm_firmware_get(subdev->device, f, &data);
+       ret = nvkm_firmware_get(subdev, f, &data);
        if (ret)
                goto free_inst;
 
        snprintf(f, sizeof(f), "gr/%s_sig", falcon_name);
-       ret = nvkm_firmware_get(subdev->device, f, &sig);
+       ret = nvkm_firmware_get(subdev, f, &sig);
        if (ret)
                goto free_data;
 
@@ -146,13 +146,15 @@ ls_ucode_img_load_gr(const struct nvkm_subdev *subdev, struct ls_ucode_img *img,
 }
 
 int
-acr_ls_ucode_load_fecs(const struct nvkm_secboot *sb, struct ls_ucode_img *img)
+acr_ls_ucode_load_fecs(const struct nvkm_secboot *sb, int maxver,
+                      struct ls_ucode_img *img)
 {
-       return ls_ucode_img_load_gr(&sb->subdev, img, "fecs");
+       return ls_ucode_img_load_gr(&sb->subdev, maxver, img, "fecs");
 }
 
 int
-acr_ls_ucode_load_gpccs(const struct nvkm_secboot *sb, struct ls_ucode_img *img)
+acr_ls_ucode_load_gpccs(const struct nvkm_secboot *sb, int maxver,
+                       struct ls_ucode_img *img)
 {
-       return ls_ucode_img_load_gr(&sb->subdev, img, "gpccs");
+       return ls_ucode_img_load_gr(&sb->subdev, maxver, img, "gpccs");
 }