| Message ID | 20230203182132.1307834-10-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/dpu: wide planes support | expand |
On 2/3/2023 10:21 AM, Dmitry Baryshkov wrote: > There is no need to pass full dpu_hw_sspp_cfg instance to > _dpu_hw_sspp_setup_scaler3, pass just struct dpu_format pointer. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> LGTM now, Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 9 ++++----- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 9 ++++----- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 ++-- > 3 files changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > index 4d3ca8532563..abf499275242 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > @@ -419,19 +419,18 @@ static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_sspp *ctx, > } > > static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_sspp *ctx, > - struct dpu_hw_sspp_cfg *sspp, > - void *scaler_cfg) > + struct dpu_hw_scaler3_cfg *scaler3_cfg, > + const struct dpu_format *format) > { > u32 idx; > - struct dpu_hw_scaler3_cfg *scaler3_cfg = scaler_cfg; > > - if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp > + if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) > || !scaler3_cfg) > return; > > dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx, > ctx->cap->sblk->scaler_blk.version, > - sspp->layout.format); > + format); > } > > static u32 _dpu_hw_sspp_get_scaler3_ver(struct dpu_hw_sspp *ctx) > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h > index 8d566ad1877e..5e9b07090a21 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h > @@ -317,13 +317,12 @@ struct dpu_hw_sspp_ops { > > /** > * setup_scaler - setup scaler > - * @ctx: Pointer to pipe context > - * @pipe_cfg: Pointer to pipe configuration > - * @scaler_cfg: Pointer to scaler configuration > + * @scaler3_cfg: Pointer to scaler configuration > + * @format: pixel format parameters > */ > void (*setup_scaler)(struct dpu_hw_sspp *ctx, > - struct dpu_hw_sspp_cfg *pipe_cfg, > - void *scaler_cfg); > + struct dpu_hw_scaler3_cfg *scaler3_cfg, > + const struct dpu_format *format); > > /** > * get_scaler_ver - get scaler h/w version > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > index 8f1767619d06..4f5c44d78332 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -677,8 +677,8 @@ static void _dpu_plane_setup_scaler(struct dpu_sw_pipe *pipe, > if (pipe_hw->ops.setup_scaler && > pipe->multirect_index != DPU_SSPP_RECT_1) > pipe_hw->ops.setup_scaler(pipe_hw, > - pipe_cfg, > - &scaler3_cfg); > + &scaler3_cfg, > + fmt); > } > > /**
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index 4d3ca8532563..abf499275242 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -419,19 +419,18 @@ static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_sspp *ctx, } static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_sspp *ctx, - struct dpu_hw_sspp_cfg *sspp, - void *scaler_cfg) + struct dpu_hw_scaler3_cfg *scaler3_cfg, + const struct dpu_format *format) { u32 idx; - struct dpu_hw_scaler3_cfg *scaler3_cfg = scaler_cfg; - if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp + if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !scaler3_cfg) return; dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx, ctx->cap->sblk->scaler_blk.version, - sspp->layout.format); + format); } static u32 _dpu_hw_sspp_get_scaler3_ver(struct dpu_hw_sspp *ctx) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index 8d566ad1877e..5e9b07090a21 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -317,13 +317,12 @@ struct dpu_hw_sspp_ops { /** * setup_scaler - setup scaler - * @ctx: Pointer to pipe context - * @pipe_cfg: Pointer to pipe configuration - * @scaler_cfg: Pointer to scaler configuration + * @scaler3_cfg: Pointer to scaler configuration + * @format: pixel format parameters */ void (*setup_scaler)(struct dpu_hw_sspp *ctx, - struct dpu_hw_sspp_cfg *pipe_cfg, - void *scaler_cfg); + struct dpu_hw_scaler3_cfg *scaler3_cfg, + const struct dpu_format *format); /** * get_scaler_ver - get scaler h/w version diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 8f1767619d06..4f5c44d78332 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -677,8 +677,8 @@ static void _dpu_plane_setup_scaler(struct dpu_sw_pipe *pipe, if (pipe_hw->ops.setup_scaler && pipe->multirect_index != DPU_SSPP_RECT_1) pipe_hw->ops.setup_scaler(pipe_hw, - pipe_cfg, - &scaler3_cfg); + &scaler3_cfg, + fmt); } /**
There is no need to pass full dpu_hw_sspp_cfg instance to _dpu_hw_sspp_setup_scaler3, pass just struct dpu_format pointer. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 9 ++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 9 ++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-)