drm/amd/display: Fix GFX12 family constant checks

Using >=, <= for checking the family is not always correct.

Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Matthew Stewart <Matthew.Stewart2@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index b4ba60e90c4766609d454e043e76a3b2d08f813f..0b4fc654e76f8042f0bc49e5e922524c587af1a4 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -11867,7 +11867,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc,
         * check tiling flags when the FB doesn't have a modifier.
         */
        if (!(fb->flags & DRM_MODE_FB_MODIFIERS)) {
-               if (adev->family >= AMDGPU_FAMILY_GC_12_0_0) {
+               if (adev->family == AMDGPU_FAMILY_GC_12_0_0) {
                        linear = AMDGPU_TILING_GET(afb->tiling_flags, GFX12_SWIZZLE_MODE) == 0;
                } else if (adev->family >= AMDGPU_FAMILY_AI) {
                        linear = AMDGPU_TILING_GET(afb->tiling_flags, SWIZZLE_MODE) == 0;

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 8c5912b59e198f9fb39be4b988c366066143bac3..b048092c5f1979234e735ee300c6107d55d8f980 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -278,7 +278,7 @@ static int amdgpu_dm_plane_validate_dcc(struct amdgpu_device *adev,
        if (!dcc->enable)
                return 0;
 
-       if (adev->family < AMDGPU_FAMILY_GC_12_0_0 &&
+       if (adev->family != AMDGPU_FAMILY_GC_12_0_0 &&
            format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
                return -EINVAL;
 
@@ -901,7 +901,7 @@ int amdgpu_dm_plane_fill_plane_buffer_attributes(struct amdgpu_device *adev,
                        upper_32_bits(chroma_addr);
        }
 
-       if (adev->family >= AMDGPU_FAMILY_GC_12_0_0) {
+       if (adev->family == AMDGPU_FAMILY_GC_12_0_0) {
                ret = amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(adev, afb, format,
                                                                                 rotation, plane_size,
                                                                                 tiling_info, dcc,