drm/msm/dpu: remove phys_vid subclass

Not holding any video encoder specific data. Get rid of it.

Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1550107156-17625-3-git-send-email-jsanka@codeaurora.org
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
index 66a1fd4b014c23c9be43f3d15828bd55f0e43caa..97fb868a4ef642c6f2250fb06dd8da2621a334b3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
@@ -252,17 +252,6 @@ static inline int dpu_encoder_phys_inc_pending(struct dpu_encoder_phys *phys)
        return atomic_inc_return(&phys->pending_kickoff_cnt);
 }
 
-/**
- * struct dpu_encoder_phys_vid - sub-class of dpu_encoder_phys to handle video
- *     mode specific operations
- * @base:      Baseclass physical encoder structure
- * @timing_params: Current timing parameter
- */
-struct dpu_encoder_phys_vid {
-       struct dpu_encoder_phys base;
-       struct intf_timing_params timing_params;
-};
-
 /**
  * struct dpu_encoder_phys_cmd - sub-class of dpu_encoder_phys to handle command
  *     mode specific operations

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 1b706eada90fd47a1158f067bb96e7955ac8cf1d..ae5449c73c5e4bf95419fb1e6ee53c11e15e5f7d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -240,7 +240,6 @@ static bool dpu_encoder_phys_vid_mode_fixup(
 static void dpu_encoder_phys_vid_setup_timing_engine(
                struct dpu_encoder_phys *phys_enc)
 {
-       struct dpu_encoder_phys_vid *vid_enc;
        struct drm_display_mode mode;
        struct intf_timing_params timing_params = { 0 };
        const struct dpu_format *fmt = NULL;
@@ -254,7 +253,6 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
        }
 
        mode = phys_enc->cached_mode;
-       vid_enc = to_dpu_encoder_phys_vid(phys_enc);
        if (!phys_enc->hw_intf->ops.setup_timing_gen) {
                DPU_ERROR("timing engine setup is not supported\n");
                return;
@@ -293,8 +291,6 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
        spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags);
 
        programmable_fetch_config(phys_enc, &timing_params);
-
-       vid_enc->timing_params = timing_params;
 }
 
 static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)
@@ -515,16 +511,13 @@ skip_flush:
 
 static void dpu_encoder_phys_vid_destroy(struct dpu_encoder_phys *phys_enc)
 {
-       struct dpu_encoder_phys_vid *vid_enc;
-
        if (!phys_enc) {
                DPU_ERROR("invalid encoder\n");
                return;
        }
 
-       vid_enc = to_dpu_encoder_phys_vid(phys_enc);
        DPU_DEBUG_VIDENC(phys_enc, "\n");
-       kfree(vid_enc);
+       kfree(phys_enc);
 }
 
 static void dpu_encoder_phys_vid_get_hw_resources(
@@ -746,7 +739,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
                struct dpu_enc_phys_init_params *p)
 {
        struct dpu_encoder_phys *phys_enc = NULL;
-       struct dpu_encoder_phys_vid *vid_enc = NULL;
        struct dpu_encoder_irq *irq;
        int i, ret = 0;
 
@@ -755,14 +747,12 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
                goto fail;
        }
 
-       vid_enc = kzalloc(sizeof(*vid_enc), GFP_KERNEL);
-       if (!vid_enc) {
+       phys_enc = kzalloc(sizeof(*phys_enc), GFP_KERNEL);
+       if (!phys_enc) {
                ret = -ENOMEM;
                goto fail;
        }
 
-       phys_enc = &vid_enc->base;
-
        phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
        phys_enc->intf_idx = p->intf_idx;
 
@@ -806,7 +796,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
 
 fail:
        DPU_ERROR("failed to create encoder\n");
-       if (vid_enc)
+       if (phys_enc)
                dpu_encoder_phys_vid_destroy(phys_enc);
 
        return ERR_PTR(ret);