[PATCH 43/60] drm/nouveau/gsp: add hal for gsp.sr_data_size()

[Ben Skeggs]

570.86.15 uses a slightly different calculation for the size of the
sysmem buffer needed to store GSP-RM's vidmem data across suspend.

Signed-off-by: Ben Skeggs <bske...@nvidia.com>
---
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c    | 12 ++++++++++--
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h      |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
index 94c3c55eb314..57eee1c5ae88 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
@@ -1705,6 +1705,14 @@ nvkm_gsp_radix3_sg(struct nvkm_gsp *gsp, struct sg_table 
*sgt, u64 size,
        return ret;
 }
 
+static u32
+r535_gsp_sr_data_size(struct nvkm_gsp *gsp)
+{
+       GspFwWprMeta *meta = gsp->wpr_meta.data;
+
+       return meta->gspFwWprEnd - meta->gspFwWprStart;
+}
+
 int
 r535_gsp_fini(struct nvkm_gsp *gsp, bool suspend)
 {
@@ -1712,8 +1720,7 @@ r535_gsp_fini(struct nvkm_gsp *gsp, bool suspend)
        int ret;
 
        if (suspend) {
-               GspFwWprMeta *meta = gsp->wpr_meta.data;
-               u64 len = meta->gspFwWprEnd - meta->gspFwWprStart;
+               u32 len = rm->api->gsp->sr_data_size(gsp);
                GspFwSRMeta *sr;
 
                ret = nvkm_gsp_sg(gsp->subdev.device, len, &gsp->sr.sgt);
@@ -2172,4 +2179,5 @@ r535_gsp = {
        .get_static_info = r535_gsp_get_static_info,
        .xlat_mc_engine_idx = r535_gsp_xlat_mc_engine_idx,
        .drop_send_user_shared_data = r535_gsp_drop_send_user_shared_data,
+       .sr_data_size = r535_gsp_sr_data_size,
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h 
b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h
index a115d24f02cf..9e162769cf3a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h
@@ -33,6 +33,7 @@ struct nvkm_rm_api {
                int (*get_static_info)(struct nvkm_gsp *);
                bool (*xlat_mc_engine_idx)(u32 mc_engine_idx, enum 
nvkm_subdev_type *, int *inst);
                void (*drop_send_user_shared_data)(struct nvkm_gsp *);
+               u32 (*sr_data_size)(struct nvkm_gsp *);
        } *gsp;
 
        const struct nvkm_rm_api_rpc {
-- 
2.49.0