kernel/git/next/linux-next.git/drivers/gpu/drm/amd, branch akpm

Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2022-06-28T06:54:05+00:00

# Conflicts: # include/linux/pagevec.h

Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

2022-06-28T01:29:28+00:00

Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git

2022-06-28T01:29:27+00:00

# Conflicts: # drivers/gpu/drm/i915/display/intel_dp.c

drm/amdgpu/display: add missing FP_START/END checks dcn32_clk_mgr.c

2022-06-27T21:06:48+00:00

Properly handle FP code in dcn32_clk_mgr.c. Fixes: 265280b99822 ("drm/amd/display: add CLKMGR changes for DCN32/321") Signed-off-by: Alex Deucher

drm/amdkfd: add SPM support for SVM

2022-06-27T20:45:13+00:00

When CPU is connected throug XGMI, it has coherent access to VRAM resource. In this case that resource is taken from a table in the device gmc aperture base. This resource is used along with the device type, which could be DEVICE_PRIVATE or DEVICE_COHERENT to create the device page map region. Also, MIGRATE_VMA_SELECT_DEVICE_COHERENT flag is selected for coherent type case during migration to device. Link: https://lkml.kernel.org/r/20220531200041.24904-7-alex.sierra@amd.com Signed-off-by: Alex Sierra Signed-off-by: Christoph Hellwig Reviewed-by: Felix Kuehling Cc: Alistair Popple Cc: David Hildenbrand Cc: Jason Gunthorpe Cc: Jerome Glisse Cc: Matthew Wilcox Cc: Ralph Campbell Signed-off-by: Andrew Morton

drm/amdgpu/display: reduce stack size in dml32_ModeSupportAndSystemConfigurationFull()

2022-06-23T21:24:19+00:00

Move more stack variable in to dummy vars structure on the heap. Fixes stack frame size errors: drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull': drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3833:1: error: the frame size of 2720 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] 3833 | } // ModeSupportAndSystemConfigurationFull | ^ Fixes: dda4fb85e433 ("drm/amd/display: DML changes for DCN32/321") Cc: Stephen Rothwell Cc: Aurabindo Pillai Cc: Rodrigo Siqueira Jordao Signed-off-by: Alex Deucher

Revert "drm/amd/display: ignore modifiers when checking for format support"

2022-06-23T21:24:10+00:00

This reverts commit 5089c4a8ebea3c3ad9eedf038dad7098ebc06131. This breaks validation and enumeration of display capable modifiers. The early return true means the rest of the validation code never gets executed, and we need that to enumerate the right modifiers to userspace for the format. The modifiers that are in the initial list generated for a plane are the superset for all formats and we need the proper checks in this function to filter some of them out for formats with which they're invalid to be used. Furthermore, the safety contract here is that we validate the incoming modifiers to ensure the kernel can handle them and the display hardware can handle them. This includes e.g. rejecting multi-plane images with DCC. Note that the legacy swizzle mechanism allows encoding more swizzles, and at fb creation time we convert them to modifiers and reject those with no corresponding modifiers. If we are seeing rejections I'm happy to help define modifiers that correspond to those, or if absolutely needed implement a fallback path to allow for less strict validation of the legacy path. However, I'd like to revert this patch, since any of these is going to be a significant rework of the patch, and I'd rather not the regression gets into a release or forgotten in the meantime. Reviewed-by: Aurabindo Pillai Signed-off-by: Bas Nieuwenhuizen Signed-off-by: Alex Deucher

drm/amdgpu/display: Fix spelling mistake "supporing" -> "supporting"

2022-06-23T21:24:03+00:00

There is a spelling mistake in a dml_print message. Fix it. Reviewed-by: Harry Wentland Signed-off-by: Colin Ian King Signed-off-by: Alex Deucher

drm/amdkfd: Fix spelling mistake "mechanim" -> "mechanism"

2022-06-23T21:23:59+00:00

There is a spelling mistake in a pr_debug message. Fix it. Signed-off-by: Colin Ian King Signed-off-by: Alex Deucher

Revert "drm/amdgpu/display: set vblank_disable_immediate for DC"

2022-06-23T21:23:17+00:00

This reverts commit 92020e81ddbeac351ea4a19bcf01743f32b9c800. This causes stuttering and timeouts with DMCUB for some users so revert it until we understand why and safely enable it to save power. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1887 Acked-by: Harry Wentland Signed-off-by: Alex Deucher Cc: Nicholas Kazlauskas