On Mon, 13 Feb 2023 at 21:14, Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx> wrote: > On 2/13/2023 8:25 AM, Dmitry Baryshkov wrote: > > On 13/02/2023 17:14, Marijn Suijten wrote: > >> On 2023-02-13 16:58:00, Dmitry Baryshkov wrote: > >>> So, *possible* the merge order is the following: > >>> - fixes from https://patchwork.freedesktop.org/series/113910/ go to > >>> msm-fixes > >>> - fixes from your intf-te go to msm-fixes > >>> - https://patchwork.freedesktop.org/series/111751/ > >>> - the rest of intf-te and catalog (*see below) > >>> - DPU features > >>> - new DPU platforms (might go together with DPU features) > >>> > > Fixes from https://patchwork.freedesktop.org/series/113910/ can be > pulled into -fixes. Will send it out in a MR. I can see that you have > absorbed a couple of independent fixes into this too (which were already > reviewed outside the HW catalog rework series) > > And from the intf TE series only this one right? > > https://patchwork.freedesktop.org/patch/516429/ I think so. At least in the first submission. > > Other than this there are no "fixes" in that series. > > >>> * That really depends on the availability of the patchsets. Most > >>> probably, as your patchset also contains several fixups, it would be > >>> easier to land it before catalog split/rework. > >>> > >>> So, if you have the available timeslot, could you please finish & send > >>> intf te on top of msm-next. > >> > >> Ack, I'll get to that immediately. You might even pull in the > >> intermediate patches linked above (that touch the catalog) to see how it > >> integrates, if I remember correctly (it has been a while) the catalog > >> changes should now be independent of driver changes...? > > > > I'll check and if it goes well, I'll just cherry-pick them into my branch. > > > >> > >>>> Sure, I will at least start looking at your 50-patch as part of > >>>> catching > >>>> back up. Do you want to process that on the mailing list or via > >>>> https://gitlab.freedesktop.org/drm/msm/-/merge_requests/44? > >>> > >>> I'd prefer to use email. The MR was open to doublecheck that nothing got > >>> broken on sc7180. > >> > >> Ack; will try providing feedback on the 50-patch series via email in > >> parallel to getting INTF TE v2 out ASAP. As discussed before I should > >> probably add myself as reviewer to the drm/msm subsystem to have these > >> patches in my inbox from the get-go though... > > > > Jessica had some minor comments/questions on the intf te series. We have > finished integrating and testing that on sm8350 while bringing up the > DSC 1.2 panel and thats what led to > https://patchwork.freedesktop.org/series/113851/ > > Please wait for her comments / R-b . Yes. My plan is to think about cherry-picking hw-catalog entries from that patchset, which hopefully are good on their own. -- With best wishes Dmitry