| Message ID | 20211229155129.5789-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] amdgpu drm-fixes-5.16 | expand |
On Thu, 30 Dec 2021 at 01:51, Alex Deucher <alexander.deucher@amd.com> 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@amd.com> 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@amd.com> 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. Dave.
On Thu, Dec 30, 2021 at 12:29 AM Dave Airlie <airlied@gmail.com> wrote: > > On Thu, 30 Dec 2021 at 01:51, Alex Deucher <alexander.deucher@amd.com> 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@amd.com> > 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@amd.com> > 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.
Hi Dave, Daniel, Fixes for 5.16. A little bigger than usual since it's two weeks worth of fixes. We have a fix for the runtime pm regression with efifb, but we are currently testing some less invasive changes. See: https://gitlab.freedesktop.org/drm/amd/-/issues/1840 https://bugzilla.kernel.org/show_bug.cgi?id=215203 Look out for another PR in the next few days with a fix for that. The current fix involves a change to fbmem.c. It would be nice to get an A-b or R-b on that if the newer fix doesn't work out. https://patchwork.kernel.org/project/dri-devel/list/?series=601558 The following changes since commit a2fbfd517117157e99160ff1b39b171872dcba07: Merge tag 'amd-drm-fixes-5.16-2021-12-15' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-12-17 15:01:01 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.16-2021-12-29 for you to fetch changes up to ee2698cf79cc759a397c61086c758d4cc85938bf: drm/amd/display: Changed pipe split policy to allow for multi-display pipe split (2021-12-28 17:02:31 -0500) ---------------------------------------------------------------- amd-drm-fixes-5.16-2021-12-29: amdgpu: - Fencing fix - XGMI fix - VCN regression fix - IP discovery regression fixes - Fix runpm documentation - Suspend/resume fixes - Yellow Carp display fixes - MCLK power management fix ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu: add support for IP discovery gc_info table v2 drm/amdgpu: fix runpm documentation drm/amdgpu: always reset the asic in suspend (v2) drm/amdgpu: no DC support for headless chips Angus Wang (1): drm/amd/display: Changed pipe split policy to allow for multi-display pipe split Charlene Liu (1): drm/amd/display: fix B0 TMDS deepcolor no dislay issue Evan Quan (1): drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform Huang Rui (1): drm/amdgpu: introduce new amdgpu_fence object to indicate the job embedded fence Lai, Derek (1): drm/amd/display: Added power down for DCN10 Lijo Lazar (1): drm/amd/pm: Fix xgmi link control on aldebaran Nicholas Kazlauskas (3): drm/amd/display: Send s0i2_rdy in stream_count == 0 optimization drm/amd/display: Set optimize_pwr_state for DCN31 drm/amd/display: Fix USB4 null pointer dereference in update_psp_stream_config Prike Liang (1): drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume chen gong (1): drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 76 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 126 ++++++++++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 ++ .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 1 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../drm/amd/display/dc/dcn201/dcn201_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 27 ++++- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 31 +++++ drivers/gpu/drm/amd/include/discovery.h | 49 ++++++++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 +- drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +- 23 files changed, 300 insertions(+), 98 deletions(-)