drm/msm/dpu: remove encoder from crtc mixer struct

Not actively used. Clean up the crtc mixer struct.

changes in v2:
	- none

Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 9be7c355debd0be51ed34f107038aa2739edb6dd..d6e692598b522bfc75a382cfcda03d2e053b0251 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -465,8 +465,6 @@ static void _dpu_crtc_setup_mixer_for_encoder(
                        return;
                }
 
-               mixer->encoder = enc;
-
                cstate->num_mixers++;
                DPU_DEBUG("setup mixer %d: lm %d\n",
                                i, mixer->hw_lm->idx - LM_0);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
index dbfb38a1986c8e8164e417add9aba1046160ee01..e59d62be4980a72be9153b23dd728a935f828393 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
@@ -84,14 +84,12 @@ struct dpu_crtc_smmu_state_data {
  * struct dpu_crtc_mixer: stores the map for each virtual pipeline in the CRTC
  * @hw_lm:     LM HW Driver context
  * @lm_ctl:    CTL Path HW driver context
- * @encoder:   Encoder attached to this lm & ctl
  * @mixer_op_mode:     mixer blending operation mode
  * @flush_mask:        mixer flush mask for ctl, mixer and pipe
  */
 struct dpu_crtc_mixer {
        struct dpu_hw_mixer *hw_lm;
        struct dpu_hw_ctl *lm_ctl;
-       struct drm_encoder *encoder;
        u32 mixer_op_mode;
        u32 flush_mask;
 };