Rows of a DMA-fetched 3D LUT in the 3D swizzle layouts must be aligned
to 256 bytes when paired with gfx11 and to 128 bytes when paired with
gfx12, as modeled by the DML 3D LUT pitch calculation. DM needs this to
advertise the framebuffer pitch it expects for a DMA 3D LUT.

Add a pitch_alignment field to struct lut3d_caps and populate it for the
ASICs that support DMA 3D LUTs: 128 bytes for DCN401, which is paired
with gfx12, and 256 bytes for DCN42 and DCN42B, which are paired with
gfx11.

Signed-off-by: Harry Wentland <[email protected]>
---
 drivers/gpu/drm/amd/display/dc/dc.h                             | 2 ++
 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c  | 2 ++
 .../gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h 
b/drivers/gpu/drm/amd/display/dc/dc.h
index d3c484f45333..e82db13687bd 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -297,6 +297,8 @@ struct lut3d_caps {
                uint32_t dim_45 : 1; /* 3D LUT support for 45x45x45 */
                uint32_t dim_65 : 1; /* 3D LUT support for 65x65x65 */
        } lut_dim_caps;
+       /*< DMA row pitch alignment in bytes for the 3D swizzle layouts */
+       uint32_t pitch_alignment;
 };
 
 /**
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c 
b/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
index e5e94e955157..a1fbe89a32bb 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
@@ -2129,6 +2129,7 @@ static bool dcn42_resource_construct(
        dc->caps.color.mpc.ocsc = 1;
        dc->caps.color.mpc.preblend = true;
        dc->caps.color.mpc.mcm_3d_lut_caps.dma_3d_lut = 1;
+       dc->caps.color.mpc.mcm_3d_lut_caps.pitch_alignment = 256;
        dc->caps.color.mpc.mcm_3d_lut_caps.lut_dim_caps.dim_9 = 1;
        dc->caps.color.mpc.mcm_3d_lut_caps.lut_dim_caps.dim_17 = 1;
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_layout_support.linear_1d = 1;
@@ -2140,6 +2141,7 @@ static bool dcn42_resource_construct(
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_pixel_order_support.order_rgba = 
1;
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_pixel_order_support.order_bgra = 
1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.dma_3d_lut = 1;
+       dc->caps.color.mpc.rmcm_3d_lut_caps.pitch_alignment = 256;
        dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_17 = 1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_33 = 1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.mem_layout_support.linear_1d = 1;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c 
b/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
index e111e7532383..4e91c908a948 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
@@ -2095,6 +2095,7 @@ static bool dcn42b_resource_construct(
        dc->caps.color.mpc.ocsc = 1;
        dc->caps.color.mpc.preblend = true;
        dc->caps.color.mpc.mcm_3d_lut_caps.dma_3d_lut = 1;
+       dc->caps.color.mpc.mcm_3d_lut_caps.pitch_alignment = 256;
        dc->caps.color.mpc.mcm_3d_lut_caps.lut_dim_caps.dim_9 = 1;
        dc->caps.color.mpc.mcm_3d_lut_caps.lut_dim_caps.dim_17 = 1;
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_layout_support.linear_1d = 1;
@@ -2106,6 +2107,7 @@ static bool dcn42b_resource_construct(
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_pixel_order_support.order_rgba = 
1;
        dc->caps.color.mpc.mcm_3d_lut_caps.mem_pixel_order_support.order_bgra = 
1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.dma_3d_lut = 1;
+       dc->caps.color.mpc.rmcm_3d_lut_caps.pitch_alignment = 256;
        dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_17 = 1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_33 = 1;
        dc->caps.color.mpc.rmcm_3d_lut_caps.mem_layout_support.linear_1d = 1;
-- 
2.56.0

Reply via email to