On Thu, Dec 30, 2021 at 12:29 AM Dave Airlie <airlied@xxxxxxxxx> wrote: > > On Thu, 30 Dec 2021 at 01:51, Alex Deucher <alexander.deucher@xxxxxxx> wrote: > > > > Hi Dave, Daniel, > > Just FYI on merging this into tip I got a conflict I'm not sure what > answer is right. > > fixes has: > ee2698cf79cc759a397c61086c758d4cc85938bf > Author: Angus Wang <angus.wang@xxxxxxx> > Date: Thu Dec 9 17:27:01 2021 -0500 > > drm/amd/display: Changed pipe split policy to allow for > multi-display pipe split > > next has: > 1edf5ae1fdaffb67c1b93e98df670cbe535d13cf > Author: Zhan Liu <Zhan.Liu@xxxxxxx> > Date: Mon Nov 8 19:31:00 2021 -0500 > > drm/amd/display: enable seamless boot for DCN301 > > -.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP, > fixes is +.pipe_split_policy = MPC_SPLIT_DYNAMIC, > next is +.pipe_split_policy = MPC_SPLIT_AVOID, > > I've chosen the -fixes answer for now, but it would be good to have > someone review it before Linus merges. It should ultimately be MPC_SPLIT_DYNAMIC. -next has an extra patch which changes it to an intermediate value before this patch changes it to MPC_SPLIT_DYNAMIC. Alex > > Dave.
