On Sat, 29 Apr 2023 at 11:46, Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx> wrote:
>
>
>
> On 4/28/2023 9:30 PM, Dmitry Baryshkov wrote:
> > On 29/04/2023 07:29, Abhinav Kumar wrote:
> >>
> >>
> >> On 4/28/2023 7:42 PM, Dmitry Baryshkov wrote:
> >>> The driver doesn't support hsic/memcolor, pcc and igc SSPP subblocks.
> >>> Drop corresponding definitions.
> >>>
> >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> >>> ---
> >>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 8 --------
> >>> 1 file changed, 8 deletions(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> >>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> >>> index 3e92c2c66716..db6488a6929d 100644
> >>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> >>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> >>> @@ -384,10 +384,6 @@ struct dpu_caps {
> >>> * @qseed_ver: qseed version
> >>> * @scaler_blk:
> >>> * @csc_blk:
> >>> - * @hsic:
> >>> - * @memcolor:
> >>> - * @pcc_blk:
> >>> - * @igc_blk:
> >>> * @format_list: Pointer to list of supported formats
> >>> * @num_formats: Number of supported formats
> >>> * @virt_format_list: Pointer to list of supported formats for
> >>> virtual planes
> >>> @@ -404,10 +400,6 @@ struct dpu_sspp_sub_blks {
> >>> u32 qseed_ver;
> >>> struct dpu_scaler_blk scaler_blk;
> >>> struct dpu_pp_blk csc_blk;
> >>> - struct dpu_pp_blk hsic_blk;
> >>> - struct dpu_pp_blk memcolor_blk;
> >>> - struct dpu_pp_blk pcc_blk;
> >>> - struct dpu_pp_blk igc_blk;
> >>
> >> I have included IGC in this patch
> >> https://patchwork.freedesktop.org/patch/534725/?series=117130&rev=1
> >>
> >> So that one can be dropped from this patch?
> >
> > It will get dropped while applying because of the conflict.
> >
>
> Knowing that its going to conflict, why not fix one of the patches now,
> preferably this one since I was handling GC/IGC together in that series.
Because it requires me to pull in additional patches into the dev
branch. No problem, I'll do it.
>
> >>
> >> Rest is fine.
> >>
> >>> const u32 *format_list;
> >>> u32 num_formats;
> >
--
With best wishes
Dmitry
