On Thu, Oct 27, 2022 at 1:42 AM Chen, Guchun <Guchun.Chen@xxxxxxx> wrote: > > Hello Alex, > > Regarding below patch, I guess we need to pick "8eb402f16d5b drm/amdgpu: Fix uninitialized warning in mmhub_v2_0_get_clockgating()" together, otherwise, build will possibly fail. Is it true? > I squashed that fix into the original patch to avoid confusion when the patch goes to stable. Alex > " Lijo Lazar (1): > drm/amdgpu: Remove ATC L2 access for MMHUB 2.1.x" > > Regards, > Guchun > > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Alex Deucher > Sent: Thursday, October 27, 2022 10:41 AM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx; airlied@xxxxxxxxx; daniel.vetter@xxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx> > Subject: [pull] amdgpu, amdkfd drm-fixes-6.1 > > Hi Dave, Daniel, > > Fixes for 6.1. Fixes for new IPs and misc other fixes. > > The following changes since commit cbc543c59e8e7c8bc8604d6ac3e18a029e3d5118: > > Merge tag 'drm-misc-fixes-2022-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-10-21 09:56:14 +1000) > > are available in the Git repository at: > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fagd5f%2Flinux.git&data=05%7C01%7Cguchun.chen%40amd.com%7C6bbe7e42eb3d43bf622208dab7c4c906%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C638024353059986195%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Y%2BU1OrPyhCaS44nGQMTrtqBpdkcJwFdFJEAaqWGiaqo%3D&reserved=0 tags/amd-drm-fixes-6.1-2022-10-26-1 > > for you to fetch changes up to d61e1d1d5225a9baeb995bcbdb904f66f70ed87e: > > drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume (2022-10-26 17:48:43 -0400) > > ---------------------------------------------------------------- > amd-drm-fixes-6.1-2022-10-26-1: > > amdgpu: > - Stable pstate fix > - SMU 13.x updates > - SR-IOV fixes > - PCI AER fix > - GC 11.x fixes > - Display fixes > - Expose IMU firmware version for debugging > - Plane modifier fix > - S0i3 fix > > amdkfd: > - Fix possible memory leak > - Fix GC 10.x cache info reporting > > UAPI: > - Expose IMU firmware version via existing INFO firmware query > > ---------------------------------------------------------------- > Alvin Lee (1): > drm/amd/display: Don't return false if no stream > > Chengming Gui (1): > drm/amdgpu: fix pstate setting issue > > David Francis (1): > drm/amd: Add IMU fw version to fw version queries > > Jesse Zhang (1): > drm/amdkfd: correct the cache info for gfx1036 > > Joaquín Ignacio Aramendía (1): > drm/amd/display: Revert logic for plane modifiers > > Kenneth Feng (2): > drm/amd/pm: update driver-if header for smu_v13_0_10 > drm/amd/pm: allow gfxoff on gc_11_0_3 > > Lijo Lazar (1): > drm/amdgpu: Remove ATC L2 access for MMHUB 2.1.x > > Prike Liang (2): > drm/amdkfd: update gfx1037 Lx cache setting > drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume > > Rafael Mendonca (1): > drm/amdkfd: Fix memory leak in kfd_mem_dmamap_userptr() > > Rodrigo Siqueira (1): > drm/amd/display: Remove wrong pipe control lock > > Yiqing Yao (1): > drm/amdgpu: Adjust MES polling timeout for sriov > > YuBiao Wang (1): > drm/amdgpu: skip mes self test for gc 11.0.3 in recover > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 18 +++- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 +++ > drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 1 + > drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 ++---- > drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 106 +++++++++++++++++++- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 ++-------- > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +-- > .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- > .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 111 +++++++++++++++------ > drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 7 +- > include/uapi/drm/amdgpu_drm.h | 2 + > 18 files changed, 259 insertions(+), 119 deletions(-)
