[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210426072819.834829187@linuxfoundation.org>
Date: Mon, 26 Apr 2021 09:29:51 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Simon Ser <contact@...rsion.fr>,
Alex Deucher <alexander.deucher@....com>,
Harry Wentland <hwentlan@....com>,
Nicholas Kazlauskas <nicholas.kazlauskas@....com>,
Bas Nieuwenhuizen <bas@...nieuwenhuizen.nl>
Subject: [PATCH 5.11 04/41] amd/display: allow non-linear multi-planar formats
From: Simon Ser <contact@...rsion.fr>
commit 9ebb6bc0125dfb1e65a53eea4aeecc63d4d6ec2d upstream.
Accept non-linear buffers which use a multi-planar format, as long
as they don't use DCC.
Tested on GFX9 with NV12.
Signed-off-by: Simon Ser <contact@...rsion.fr>
Cc: Alex Deucher <alexander.deucher@....com>
Cc: Harry Wentland <hwentlan@....com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@....com>
Cc: Bas Nieuwenhuizen <bas@...nieuwenhuizen.nl>
Reviewed-by: Bas Nieuwenhuizen <bas@...nieuwenhuizen.nl>
Signed-off-by: Alex Deucher <alexander.deucher@....com>
Cc: stable@...r.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3963,13 +3963,6 @@ static bool dm_plane_format_mod_supporte
return true;
/*
- * The arbitrary tiling support for multiplane formats has not been hooked
- * up.
- */
- if (info->num_planes > 1)
- return false;
-
- /*
* For D swizzle the canonical modifier depends on the bpp, so check
* it here.
*/
@@ -3987,6 +3980,10 @@ static bool dm_plane_format_mod_supporte
/* Per radeonsi comments 16/64 bpp are more complicated. */
if (info->cpp[0] != 4)
return false;
+ /* We support multi-planar formats, but not when combined with
+ * additional DCC metadata planes. */
+ if (info->num_planes > 1)
+ return false;
}
return true;
Powered by blists - more mailing lists