These commits failed to apply cleanly to stable so I have cherry-picked them from Linus' tree and fixed up the conflicts. The original uptream commit is referenced in the commit message as I used cherry-pick -x. Please apply! Thanks, Alex Alex Deucher (1): drm/amdgpu/swsmu: drop smu i2c bus on navi1x Andrey Grodzovsky (1): drm/amd/psp: Fix sysfs: cannot create duplicate filename Evan Quan (1): drm/amd/pm: increase mclk switch threshold to 200 us Kenneth Feng (1): drm/amd/pm: fix pp_dpm_fclk Kevin Wang (1): drm/amd/swsmu: add missing feature map for sienna_cichlid Likun Gao (2): drm/amdgpu: add function to program pbb mode for sienna cichlid drm/amdgpu: correct the cu and rb info for sienna cichlid drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 71 +++++++++++++++++++ .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ------- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 6 ++ 6 files changed, 81 insertions(+), 28 deletions(-) -- 2.25.4
