drm/msm/dpu: get rid of struct dpu_rm_requirements

The struct dpu_rm_requirements was used to wrap display topology and
hw resources, which meant INTF indices. As of commit ef58e0ad3436
("drm/msm/dpu: get INTF blocks directly rather than through RM") the hw
resources struct was removed, leaving struct dpu_rm_requirements
containing a single field (topology). Remove the useless wrapper.

Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
[DB: dropped stray msm_drv.h inclusion]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/629259/
Link: https://lore.kernel.org/r/20241216-concurrent-wb-v4-5-fe220297a7f0@quicinc.com

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 83de7564e2c1fe14fcf8c4f82335cafc937e1b99..5172ab4dea995a154cd88d05c3842d7425fc34ce 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -800,7 +800,7 @@ static int dpu_encoder_virt_atomic_check(
 
                if (!crtc_state->active_changed || crtc_state->enable)
                        ret = dpu_rm_reserve(&dpu_kms->rm, global_state,
-                                       drm_enc, crtc_state, topology);
+                                       drm_enc, crtc_state, &topology);
                if (!ret)
                        dpu_encoder_assign_crtc_resources(dpu_kms, drm_enc,
                                                          global_state, crtc_state);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
index 17b5d53297f23169aba3537f85f02f04421ac9e7..7ebb7e4276ca7225be5e9ae65667e3dbc505cf07 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
@@ -26,14 +26,6 @@ static inline bool reserved_by_other(uint32_t *res_map, int idx,
        return res_map[idx] && res_map[idx] != enc_id;
 }
 
-/**
- * struct dpu_rm_requirements - Reservation requirements parameter bundle
- * @topology:  selected topology for the display
- */
-struct dpu_rm_requirements {
-       struct msm_display_topology topology;
-};
-
 /**
  * dpu_rm_init - Read hardware catalog and create reservation tracking objects
  *     for all HW blocks.
@@ -241,14 +233,13 @@ static int _dpu_rm_get_lm_peer(struct dpu_rm *rm, int primary_idx)
  *      mixer in rm->pingpong_blks[].
  * @dspp_idx: output parameter, index of dspp block attached to the layer
  *      mixer in rm->dspp_blks[].
- * @reqs: input parameter, rm requirements for HW blocks needed in the
- *      datapath.
+ * @topology:  selected topology for the display
  * Return: true if lm matches all requirements, false otherwise
  */
 static bool _dpu_rm_check_lm_and_get_connected_blks(struct dpu_rm *rm,
                struct dpu_global_state *global_state,
                uint32_t enc_id, int lm_idx, int *pp_idx, int *dspp_idx,
-               struct dpu_rm_requirements *reqs)
+               struct msm_display_topology *topology)
 {
        const struct dpu_lm_cfg *lm_cfg;
        int idx;
@@ -273,7 +264,7 @@ static bool _dpu_rm_check_lm_and_get_connected_blks(struct dpu_rm *rm,
        }
        *pp_idx = idx;
 
-       if (!reqs->topology.num_dspp)
+       if (!topology->num_dspp)
                return true;
 
        idx = lm_cfg->dspp - DSPP_0;
@@ -295,7 +286,7 @@ static bool _dpu_rm_check_lm_and_get_connected_blks(struct dpu_rm *rm,
 static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
                               struct dpu_global_state *global_state,
                               uint32_t enc_id,
-                              struct dpu_rm_requirements *reqs)
+                              struct msm_display_topology *topology)
 
 {
        int lm_idx[MAX_BLOCKS];
@@ -303,14 +294,14 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
        int dspp_idx[MAX_BLOCKS] = {0};
        int i, lm_count = 0;
 
-       if (!reqs->topology.num_lm) {
-               DPU_ERROR("invalid number of lm: %d\n", reqs->topology.num_lm);
+       if (!topology->num_lm) {
+               DPU_ERROR("invalid number of lm: %d\n", topology->num_lm);
                return -EINVAL;
        }
 
        /* Find a primary mixer */
        for (i = 0; i < ARRAY_SIZE(rm->mixer_blks) &&
-                       lm_count < reqs->topology.num_lm; i++) {
+                       lm_count < topology->num_lm; i++) {
                if (!rm->mixer_blks[i])
                        continue;
 
@@ -319,14 +310,14 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
 
                if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state,
                                enc_id, i, &pp_idx[lm_count],
-                               &dspp_idx[lm_count], reqs)) {
+                               &dspp_idx[lm_count], topology)) {
                        continue;
                }
 
                ++lm_count;
 
                /* Valid primary mixer found, find matching peers */
-               if (lm_count < reqs->topology.num_lm) {
+               if (lm_count < topology->num_lm) {
                        int j = _dpu_rm_get_lm_peer(rm, i);
 
                        /* ignore the peer if there is an error or if the peer was already processed */
@@ -339,7 +330,7 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
                        if (!_dpu_rm_check_lm_and_get_connected_blks(rm,
                                        global_state, enc_id, j,
                                        &pp_idx[lm_count], &dspp_idx[lm_count],
-                                       reqs)) {
+                                       topology)) {
                                continue;
                        }
 
@@ -348,7 +339,7 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
                }
        }
 
-       if (lm_count != reqs->topology.num_lm) {
+       if (lm_count != topology->num_lm) {
                DPU_DEBUG("unable to find appropriate mixers\n");
                return -ENAVAIL;
        }
@@ -357,7 +348,7 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
                global_state->mixer_to_enc_id[lm_idx[i]] = enc_id;
                global_state->pingpong_to_enc_id[pp_idx[i]] = enc_id;
                global_state->dspp_to_enc_id[dspp_idx[i]] =
-                       reqs->topology.num_dspp ? enc_id : 0;
+                       topology->num_dspp ? enc_id : 0;
 
                trace_dpu_rm_reserve_lms(lm_idx[i] + LM_0, enc_id,
                                         pp_idx[i] + PINGPONG_0);
@@ -594,28 +585,28 @@ static int _dpu_rm_make_reservation(
                struct dpu_rm *rm,
                struct dpu_global_state *global_state,
                struct drm_encoder *enc,
-               struct dpu_rm_requirements *reqs)
+               struct msm_display_topology *topology)
 {
        int ret;
 
-       ret = _dpu_rm_reserve_lms(rm, global_state, enc->base.id, reqs);
+       ret = _dpu_rm_reserve_lms(rm, global_state, enc->base.id, topology);
        if (ret) {
                DPU_ERROR("unable to find appropriate mixers\n");
                return ret;
        }
 
        ret = _dpu_rm_reserve_ctls(rm, global_state, enc->base.id,
-                               &reqs->topology);
+                       topology);
        if (ret) {
                DPU_ERROR("unable to find appropriate CTL\n");
                return ret;
        }
 
-       ret  = _dpu_rm_reserve_dsc(rm, global_state, enc, &reqs->topology);
+       ret  = _dpu_rm_reserve_dsc(rm, global_state, enc, topology);
        if (ret)
                return ret;
 
-       if (reqs->topology.needs_cdm) {
+       if (topology->needs_cdm) {
                ret = _dpu_rm_reserve_cdm(rm, global_state, enc);
                if (ret) {
                        DPU_ERROR("unable to find CDM blk\n");
@@ -626,20 +617,6 @@ static int _dpu_rm_make_reservation(
        return ret;
 }
 
-static int _dpu_rm_populate_requirements(
-               struct drm_encoder *enc,
-               struct dpu_rm_requirements *reqs,
-               struct msm_display_topology req_topology)
-{
-       reqs->topology = req_topology;
-
-       DRM_DEBUG_KMS("num_lm: %d num_dsc: %d num_intf: %d cdm: %d\n",
-                     reqs->topology.num_lm, reqs->topology.num_dsc,
-                     reqs->topology.num_intf, reqs->topology.needs_cdm);
-
-       return 0;
-}
-
 static void _dpu_rm_clear_mapping(uint32_t *res_mapping, int cnt,
                                  uint32_t enc_id)
 {
@@ -693,9 +670,8 @@ int dpu_rm_reserve(
                struct dpu_global_state *global_state,
                struct drm_encoder *enc,
                struct drm_crtc_state *crtc_state,
-               struct msm_display_topology topology)
+               struct msm_display_topology *topology)
 {
-       struct dpu_rm_requirements reqs;
        int ret;
 
        /* Check if this is just a page-flip */
@@ -710,13 +686,11 @@ int dpu_rm_reserve(
        DRM_DEBUG_KMS("reserving hw for enc %d crtc %d\n",
                      enc->base.id, crtc_state->crtc->base.id);
 
-       ret = _dpu_rm_populate_requirements(enc, &reqs, topology);
-       if (ret) {
-               DPU_ERROR("failed to populate hw requirements\n");
-               return ret;
-       }
+       DRM_DEBUG_KMS("num_lm: %d num_dsc: %d num_intf: %d\n",
+                     topology->num_lm, topology->num_dsc,
+                     topology->num_intf);
 
-       ret = _dpu_rm_make_reservation(rm, global_state, enc, &reqs);
+       ret = _dpu_rm_make_reservation(rm, global_state, enc, topology);
        if (ret)
                DPU_ERROR("failed to reserve hw resources: %d\n", ret);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
index 9cdfa53d7173d41dfefe985fdc77f1885dbec4ff..8f2f041fc70875c569debb068893f69293bfa7f4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
@@ -69,7 +69,7 @@ int dpu_rm_reserve(struct dpu_rm *rm,
                struct dpu_global_state *global_state,
                struct drm_encoder *drm_enc,
                struct drm_crtc_state *crtc_state,
-               struct msm_display_topology topology);
+               struct msm_display_topology *topology);
 
 void dpu_rm_release(struct dpu_global_state *global_state,
                struct drm_encoder *enc);