]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/amdgpu/display: Allow DCC for video formats on GFX12
authorDavid Rosca <david.rosca@amd.com>
Thu, 13 Feb 2025 14:30:37 +0000 (15:30 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 10 Mar 2025 18:07:35 +0000 (14:07 -0400)
We advertise DCC as supported for NV12/P010 formats on GFX12,
but it would fail on this check on atomic commit.

Signed-off-by: David Rosca <david.rosca@amd.com>
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ba795235a2b99ba9bbef647ab003b2f3145d9bbb)
Cc: stable@vger.kernel.org # 6.12.x
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

index 774cc3f4f3fd9a964fe48c66eb596d2f6dfee602..92472109f84a93c3e91fbf946254a8b6f7ac8686 100644 (file)
@@ -277,8 +277,11 @@ static int amdgpu_dm_plane_validate_dcc(struct amdgpu_device *adev,
        if (!dcc->enable)
                return 0;
 
-       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN ||
-           !dc->cap_funcs.get_dcc_compression_cap)
+       if (adev->family < AMDGPU_FAMILY_GC_12_0_0 &&
+           format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
+               return -EINVAL;
+
+       if (!dc->cap_funcs.get_dcc_compression_cap)
                return -EINVAL;
 
        input.format = format;