drm/msm/dpu: use kms stored hw mdp block

Avoid querying RM for hw mdp block. Use the one
stored in KMS during initialization.

changes in v4:
	- none
changes in v5:
	- none

Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 3084675ed42578ed70b22ce40241673b782f5435..c8c4612dc34ddb430499d2038f6124173258717d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -823,7 +823,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(
 {
        struct dpu_encoder_phys *phys_enc = NULL;
        struct dpu_encoder_phys_cmd *cmd_enc = NULL;
-       struct dpu_hw_mdp *hw_mdp;
        struct dpu_encoder_irq *irq;
        int i, ret = 0;
 
@@ -836,14 +835,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(
                goto fail;
        }
        phys_enc = &cmd_enc->base;
-
-       hw_mdp = dpu_rm_get_mdp(&p->dpu_kms->rm);
-       if (IS_ERR_OR_NULL(hw_mdp)) {
-               ret = PTR_ERR(hw_mdp);
-               DPU_ERROR("failed to get mdptop\n");
-               goto fail_mdp_init;
-       }
-       phys_enc->hw_mdptop = hw_mdp;
+       phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
        phys_enc->intf_idx = p->intf_idx;
 
        dpu_encoder_phys_cmd_init_ops(&phys_enc->ops);
@@ -898,8 +890,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(
 
        return phys_enc;
 
-fail_mdp_init:
-       kfree(cmd_enc);
 fail:
        return ERR_PTR(ret);
 }

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 6fc3d3fb2253ea93afa1166100677144d3f9172f..ecb8c65ab6cd4c2e20729d0bedbe508a4522ce9d 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
@@ -801,7 +801,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
        struct dpu_encoder_phys *phys_enc = NULL;
        struct dpu_encoder_phys_vid *vid_enc = NULL;
        struct dpu_rm_hw_iter iter;
-       struct dpu_hw_mdp *hw_mdp;
        struct dpu_encoder_irq *irq;
        int i, ret = 0;
 
@@ -818,13 +817,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
 
        phys_enc = &vid_enc->base;
 
-       hw_mdp = dpu_rm_get_mdp(&p->dpu_kms->rm);
-       if (IS_ERR_OR_NULL(hw_mdp)) {
-               ret = PTR_ERR(hw_mdp);
-               DPU_ERROR("failed to get mdptop\n");
-               goto fail;
-       }
-       phys_enc->hw_mdptop = hw_mdp;
+       phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
        phys_enc->intf_idx = p->intf_idx;
 
        /**