As a preparation for calling dpu_encoder_get_topology() from different
code paths, simplify its calling interface, obtaining some data pointers
internally instead passing them via arguments.

Reviewed-by: Abhinav Kumar <quic_abhin...@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 
5dc2e0585de1337601a0426795d2c8f2806ccd10..fe139c49823674adf980db5faa3f2acd4c9c20dd
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -649,14 +649,14 @@ struct drm_dsc_config *dpu_encoder_get_dsc_config(struct 
drm_encoder *drm_enc)
 
 static struct msm_display_topology dpu_encoder_get_topology(
                        struct dpu_encoder_virt *dpu_enc,
-                       struct dpu_kms *dpu_kms,
                        struct drm_display_mode *mode,
                        struct drm_crtc_state *crtc_state,
-                       struct drm_connector_state *conn_state,
-                       struct drm_dsc_config *dsc)
+                       struct drm_connector_state *conn_state)
 {
        struct msm_drm_private *priv = dpu_enc->base.dev->dev_private;
        struct msm_display_info *disp_info = &dpu_enc->disp_info;
+       struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
+       struct drm_dsc_config *dsc = dpu_encoder_get_dsc_config(&dpu_enc->base);
        struct msm_display_topology topology = {0};
        int i, intf_count = 0;
 
@@ -764,7 +764,6 @@ static int dpu_encoder_virt_atomic_check(
        struct drm_display_mode *adj_mode;
        struct msm_display_topology topology;
        struct dpu_global_state *global_state;
-       struct drm_dsc_config *dsc;
        int ret = 0;
 
        if (!drm_enc || !crtc_state || !conn_state) {
@@ -785,10 +784,7 @@ static int dpu_encoder_virt_atomic_check(
 
        trace_dpu_enc_atomic_check(DRMID(drm_enc));
 
-       dsc = dpu_encoder_get_dsc_config(drm_enc);
-
-       topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, 
crtc_state, conn_state,
-                                           dsc);
+       topology = dpu_encoder_get_topology(dpu_enc, adj_mode, crtc_state, 
conn_state);
 
        if (topology.needs_cdm && !dpu_enc->cur_master->hw_cdm)
                crtc_state->mode_changed = true;

-- 
2.39.5

Reply via email to