drm/msm/a6xx: Share dependency vote table with GMU

A8x GMU firmwares expect a separate vote table which describes the
relationship between the Gx rail and MxA rail (and possibly Cx rail).
Create this new vote table and implement the new HFI message which
allows passing vote tables to send this data to GMU.

Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/689016/
Message-ID: <20251118-kaana-gpu-support-v4-13-86eeb8e93fb6@oss.qualcomm.com>
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index b76960c6d44487aea38cfc5d57c0cee10b5c883f..cede210a0a78a6f381549473d186a8a10909e379 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1616,6 +1616,57 @@ static int a6xx_gmu_rpmh_arc_votes_init(struct device *dev, u32 *votes,
        return 0;
 }
 
+static int a6xx_gmu_rpmh_dep_votes_init(struct device *dev, u32 *votes,
+               unsigned long *freqs, int freqs_count)
+{
+       const u16 *mx;
+       size_t count;
+
+       mx = cmd_db_read_aux_data("mx.lvl", &count);
+       if (IS_ERR(mx))
+               return PTR_ERR(mx);
+       /*
+        * The data comes back as an array of unsigned shorts so adjust the
+        * count accordingly
+        */
+       count >>= 1;
+       if (!count)
+               return -EINVAL;
+
+       /* Fix the vote for zero frequency */
+       votes[0] = 0xffffffff;
+
+       /* Construct a vote for rest of the corners */
+       for (int i = 1; i < freqs_count; i++) {
+               unsigned int level = a6xx_gmu_get_arc_level(dev, freqs[i]);
+               u8 j, index = 0;
+
+               /* Get the primary index that matches the arc level */
+               for (j = 0; j < count; j++) {
+                       if (mx[j] >= level) {
+                               index = j;
+                               break;
+                       }
+               }
+
+               if (j == count) {
+                       DRM_DEV_ERROR(dev,
+                                     "Mx Level %u not found in the RPMh list\n",
+                                     level);
+                       DRM_DEV_ERROR(dev, "Available levels:\n");
+                       for (j = 0; j < count; j++)
+                               DRM_DEV_ERROR(dev, "  %u\n", mx[j]);
+
+                       return -EINVAL;
+               }
+
+               /* Construct the vote */
+               votes[i] = (0x3fff << 14) | (index << 8) | (0xff);
+       }
+
+       return 0;
+}
+
 /*
  * The GMU votes with the RPMh for itself and on behalf of the GPU but we need
  * to construct the list of votes on the CPU and send it over. Query the RPMh
@@ -1649,6 +1700,9 @@ static int a6xx_gmu_rpmh_votes_init(struct a6xx_gmu *gmu)
        ret |= a6xx_gmu_rpmh_arc_votes_init(gmu->dev, gmu->cx_arc_votes,
                gmu->gmu_freqs, gmu->nr_gmu_freqs, "cx.lvl", "mx.lvl");
 
+       ret |= a6xx_gmu_rpmh_dep_votes_init(gmu->dev, gmu->dep_arc_votes,
+               gmu->gpu_freqs, gmu->nr_gpu_freqs);
+
        /* Build the interconnect votes */
        if (info->bcms && gmu->nr_gpu_bws > 1)
                ret |= a6xx_gmu_rpmh_bw_votes_init(adreno_gpu, info, gmu);

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
index edf6c282cd7634248e8dd134605c24fc2b6dc6c2..2af074c8e8cfa775a7d35a786834dba30395c8c4 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
@@ -97,6 +97,7 @@ struct a6xx_gmu {
        int nr_gpu_freqs;
        unsigned long gpu_freqs[GMU_MAX_GX_FREQS];
        u32 gx_arc_votes[GMU_MAX_GX_FREQS];
+       u32 dep_arc_votes[GMU_MAX_GX_FREQS];
        struct a6xx_hfi_acd_table acd_table;
 
        int nr_gpu_bws;

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
index 206eb204cea1e6cb1405eb225ac7ff53602e5d19..53cfdf4e6c346857cff08ad644e868a1c6c13000 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c
@@ -23,6 +23,7 @@ static const char * const a6xx_hfi_msg_id[] = {
        HFI_MSG_ID(HFI_H2F_MSG_START),
        HFI_MSG_ID(HFI_H2F_FEATURE_CTRL),
        HFI_MSG_ID(HFI_H2F_MSG_CORE_FW_START),
+       HFI_MSG_ID(HFI_H2F_MSG_TABLE),
        HFI_MSG_ID(HFI_H2F_MSG_GX_BW_PERF_VOTE),
        HFI_MSG_ID(HFI_H2F_MSG_PREPARE_SLUMBER),
 };
@@ -270,11 +271,63 @@ static int a6xx_hfi_send_perf_table_v1(struct a6xx_gmu *gmu)
                NULL, 0);
 }
 
+static int a8xx_hfi_send_perf_table(struct a6xx_gmu *gmu)
+{
+       unsigned int num_gx_votes = 3, num_cx_votes = 2;
+       struct a6xx_hfi_table_entry *entry;
+       struct a6xx_hfi_table *tbl;
+       int ret, i;
+       u32 size;
+
+       size = sizeof(*tbl) +  (2 * sizeof(tbl->entry[0])) +
+               (gmu->nr_gpu_freqs * num_gx_votes * sizeof(gmu->gx_arc_votes[0])) +
+               (gmu->nr_gmu_freqs * num_cx_votes * sizeof(gmu->cx_arc_votes[0]));
+       tbl = kzalloc(size, GFP_KERNEL);
+       tbl->type = HFI_TABLE_GPU_PERF;
+
+       /* First fill GX votes */
+       entry = &tbl->entry[0];
+       entry->count = gmu->nr_gpu_freqs;
+       entry->stride = num_gx_votes;
+
+       for (i = 0; i < gmu->nr_gpu_freqs; i++) {
+               unsigned int base = i * entry->stride;
+
+               entry->data[base+0] = gmu->gx_arc_votes[i];
+               entry->data[base+1] = gmu->dep_arc_votes[i];
+               entry->data[base+2] = gmu->gpu_freqs[i] / 1000;
+       }
+
+       /* Then fill CX votes */
+       entry = (struct a6xx_hfi_table_entry *)
+               &tbl->entry[0].data[gmu->nr_gpu_freqs * num_gx_votes];
+
+       entry->count = gmu->nr_gmu_freqs;
+       entry->stride = num_cx_votes;
+
+       for (i = 0; i < gmu->nr_gmu_freqs; i++) {
+               unsigned int base = i * entry->stride;
+
+               entry->data[base] = gmu->cx_arc_votes[i];
+               entry->data[base+1] = gmu->gmu_freqs[i] / 1000;
+       }
+
+       ret = a6xx_hfi_send_msg(gmu, HFI_H2F_MSG_TABLE, tbl, size, NULL, 0);
+
+       kfree(tbl);
+       return ret;
+}
+
 static int a6xx_hfi_send_perf_table(struct a6xx_gmu *gmu)
 {
+       struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu);
+       struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
        struct a6xx_hfi_msg_perf_table msg = { 0 };
        int i;
 
+       if (adreno_is_a8xx(adreno_gpu))
+               return a8xx_hfi_send_perf_table(gmu);
+
        msg.num_gpu_levels = gmu->nr_gpu_freqs;
        msg.num_gmu_levels = gmu->nr_gmu_freqs;
 

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
index 653ef720e2da4d2b0793c0b76e994b6f6dc524c7..6f9f74a0bc855f8a3e83c54303d5f3d6c8c7541d 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h
@@ -185,6 +185,23 @@ struct a6xx_hfi_msg_core_fw_start {
        u32 handle;
 };
 
+#define HFI_H2F_MSG_TABLE 15
+
+struct a6xx_hfi_table_entry {
+       u32 count;
+       u32 stride;
+       u32 data[];
+};
+
+struct a6xx_hfi_table {
+       u32 header;
+       u32 version;
+       u32 type;
+#define HFI_TABLE_BW_VOTE 0
+#define HFI_TABLE_GPU_PERF 1
+       struct a6xx_hfi_table_entry entry[];
+};
+
 #define HFI_H2F_MSG_GX_BW_PERF_VOTE 30
 
 struct a6xx_hfi_gx_bw_perf_vote_cmd {