On Tue, Aug 07, 2018 at 08:12:32PM -0700, Jeykumar Sankaran wrote: > Avoid querying RM for hw mdp block. Use the one > stored in KMS during initialization. > > changes in v2: > - none > changes in v3: > - none > > Change-Id: I52129b96bd561a5547507d7f567bcaa3dbe554aa > Signed-off-by: Jeykumar Sankaran <jsanka@xxxxxxxxxxxxxx> Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 12 +----------- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 9 +-------- > 2 files changed, 2 insertions(+), 19 deletions(-) > > 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 3084675..c8c4612 100644 > --- 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 14fc7c2..57ece03 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > @@ -829,7 +829,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; > > @@ -846,13 +845,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; > > /** > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel