drm/msm: dpu: Stop using encoder->crtc pointer

It's for legacy drivers, for atomic drivers crtc->state->encoder_mask
should be used to map encoder to crtc.

Changes in v2:
- None

Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
[seanpaul resolved conflict with async param of dpu_encoder_kickoff]

Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 8881f88391b0d367f29f080ee197266a2172829c..5745d46a7858cd71a9d4d18a285c8b911e2cec55 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -284,9 +284,9 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc *crtc)
                return INTF_MODE_NONE;
        }
 
-       drm_for_each_encoder(encoder, crtc->dev)
-               if (encoder->crtc == crtc)
-                       return dpu_encoder_get_intf_mode(encoder);
+       /* TODO: Returns the first INTF_MODE, could there be multiple values? */
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
+               return dpu_encoder_get_intf_mode(encoder);
 
        return INTF_MODE_NONE;
 }
@@ -562,13 +562,9 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
                spin_unlock_irqrestore(&dev->event_lock, flags);
        }
 
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-               if (encoder->crtc != crtc)
-                       continue;
-
-               /* encoder will trigger pending mask now */
+       /* encoder will trigger pending mask now */
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
                dpu_encoder_trigger_kickoff_pending(encoder);
-       }
 
        /*
         * If no mixers have been allocated in dpu_crtc_atomic_check(),
@@ -715,7 +711,6 @@ static int _dpu_crtc_wait_for_frame_done(struct drm_crtc *crtc)
 void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async)
 {
        struct drm_encoder *encoder;
-       struct drm_device *dev = crtc->dev;
        struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
        struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);
        struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
@@ -731,16 +726,13 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async)
 
        DPU_ATRACE_BEGIN("crtc_commit");
 
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+       /*
+        * Encoder will flush/start now, unless it has a tx pending. If so, it
+        * may delay and flush at an irq event (e.g. ppdone)
+        */
+       drm_for_each_encoder_mask(encoder, crtc->dev,
+                                 crtc->state->encoder_mask) {
                struct dpu_encoder_kickoff_params params = { 0 };
-
-               if (encoder->crtc != crtc)
-                       continue;
-
-               /*
-                * Encoder will flush/start now, unless it has a tx pending.
-                * If so, it may delay and flush at an irq event (e.g. ppdone)
-                */
                dpu_encoder_prepare_for_kickoff(encoder, &params, async);
        }
 
@@ -768,12 +760,8 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async)
 
        dpu_vbif_clear_errors(dpu_kms);
 
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-               if (encoder->crtc != crtc)
-                       continue;
-
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
                dpu_encoder_kickoff(encoder, async);
-       }
 
 end:
        if (!async)
@@ -910,11 +898,8 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
 
        dpu_core_perf_crtc_update(crtc, 0, true);
 
-       drm_for_each_encoder(encoder, crtc->dev) {
-               if (encoder->crtc != crtc)
-                       continue;
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
                dpu_encoder_register_frame_event_callback(encoder, NULL, NULL);
-       }
 
        memset(cstate->mixers, 0, sizeof(cstate->mixers));
        cstate->num_mixers = 0;
@@ -949,12 +934,9 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,
        DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
        dpu_crtc = to_dpu_crtc(crtc);
 
-       drm_for_each_encoder(encoder, crtc->dev) {
-               if (encoder->crtc != crtc)
-                       continue;
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
                dpu_encoder_register_frame_event_callback(encoder,
                                dpu_crtc_frame_event_cb, (void *)crtc);
-       }
 
        mutex_lock(&dpu_crtc->crtc_lock);
        trace_dpu_crtc_enable(DRMID(crtc), true, dpu_crtc);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 606b284064a685577fc5ba0289189351371b879d..7085cde868be1db67fac5212c6f1ecde2ae9c4d3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -320,7 +320,10 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
        struct dpu_kms *dpu_kms;
        struct msm_drm_private *priv;
        struct drm_device *dev;
+       struct drm_crtc *crtc;
+       struct drm_crtc_state *crtc_state;
        struct drm_encoder *encoder;
+       int i;
 
        if (!kms)
                return;
@@ -332,9 +335,13 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
        priv = dev->dev_private;
        pm_runtime_get_sync(&dpu_kms->pdev->dev);
 
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
-               if (encoder->crtc != NULL)
+       /* Call prepare_commit for all affected encoders */
+       for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
+               drm_for_each_encoder_mask(encoder, crtc->dev,
+                                         crtc_state->encoder_mask) {
                        dpu_encoder_prepare_commit(encoder);
+               }
+       }
 }
 
 /*
@@ -344,13 +351,17 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
 void dpu_kms_encoder_enable(struct drm_encoder *encoder)
 {
        const struct drm_encoder_helper_funcs *funcs = encoder->helper_private;
-       struct drm_crtc *crtc = encoder->crtc;
+       struct drm_device *dev = encoder->dev;
+       struct drm_crtc *crtc;
 
        /* Forward this enable call to the commit hook */
        if (funcs && funcs->commit)
                funcs->commit(encoder);
 
-       if (crtc && crtc->state->active) {
+       drm_for_each_crtc(crtc, dev) {
+               if (!(crtc->state->encoder_mask & drm_encoder_mask(encoder)))
+                       continue;
+
                trace_dpu_kms_enc_enable(DRMID(crtc));
                dpu_crtc_commit_kickoff(crtc, false);
        }