DC's enum surface_pixel_format has no RGBA8888 (memory order A,B,G,R): fill_dc_plane_info_and_addr() has no case for it and returns -EINVAL. Yet rgb_formats[] and overlay_formats[] advertise DRM_FORMAT_RGBA8888, so compositors (KWin on Wayland) pick it for layers with alpha and every atomic commit fails once per frame, flooding dmesg with
amdgpu 0000:06:00.0: [drm] *ERROR* Unsupported screen format RA24 little-endian (0x34324152) and forcing a fallback to composition on every frame. Remove the two entries. No working configuration is lost: a plane that advertises RGBA8888 can never convert it in fill_dc_plane_info_and_addr(), on any display generation. Update the KUnit expectations in dm_test_get_plane_formats() accordingly: 14/20/9/14 -> 13/19/8/13. Tested on Raphael 610M (DCN 3.1.5): before, ~240 atomic commits per second failed with -EINVAL; after, the plane format list no longer contains RA24 and dmesg is clean. Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/5339 Signed-off-by: MuXian Chen <[email protected]> --- v2: - update dm_test_get_plane_formats() expectations after dropping RGBA8888 (reported by Sashiko AI review). --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5 +++-- .../amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 9139823..6d5454f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -49,11 +49,13 @@ * For future use cases we should either initialize them dynamically based on * plane capabilities, or initialize this array to all formats, so internal drm * check will succeed, and let DC implement proper check + * + * DC has no surface format for DRM_FORMAT_RGBA8888, so it must not be + * advertised here or in overlay_formats. */ static const uint32_t rgb_formats[] = { DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, - DRM_FORMAT_RGBA8888, DRM_FORMAT_XRGB2101010, DRM_FORMAT_XBGR2101010, DRM_FORMAT_ARGB2101010, @@ -70,7 +72,6 @@ static const uint32_t rgb_formats[] = { static const uint32_t overlay_formats[] = { DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, - DRM_FORMAT_RGBA8888, DRM_FORMAT_XBGR8888, DRM_FORMAT_ABGR8888, DRM_FORMAT_RGB565, diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c index 7422e8b..3e7ef6d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c @@ -277,20 +277,20 @@ static void dm_test_get_plane_formats(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, universal_cap); plane->type = DRM_PLANE_TYPE_PRIMARY; - KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, NULL, formats, 32), 14); + KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, NULL, formats, 32), 13); cap->pixel_format_support.nv12 = true; cap->pixel_format_support.p010 = true; cap->pixel_format_support.fp16 = true; - KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, cap, formats, 32), 20); + KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, cap, formats, 32), 19); plane->type = DRM_PLANE_TYPE_OVERLAY; - KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, NULL, formats, 32), 9); + KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, NULL, formats, 32), 8); universal_cap->type = DC_PLANE_TYPE_DCN_UNIVERSAL; KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, universal_cap, formats, 32), - 14); + 13); plane->type = DRM_PLANE_TYPE_CURSOR; KUNIT_EXPECT_EQ(test, amdgpu_dm_plane_get_plane_formats(plane, NULL, formats, 32), 1); -- 2.56.0
