<div dir="auto">Btw please add a fixes tag so it gets directed to stable releases.<div dir="auto"> </div><div dir="auto">Thanks!</div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Apr 15, 2021, 6:06 PM Zhuo, Qingqing <<a href="mailto:Qingqing.Zhuo@amd.com">Qingqing.Zhuo@amd.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div lang="EN-US" link="blue" vlink="purple" style="word-wrap:break-word"> <div class="m_1862946999310511708WordSection1"> [AMD Public Use] Inline. <div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0in 0in 0in"> From: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl" target="_blank" rel="noreferrer">bas@basnieuwenhuizen.nl</a>> Sent: Thursday, April 15, 2021 7:26 AM To: Zhuo, Qingqing <<a href="mailto:Qingqing.Zhuo@amd.com" target="_blank" rel="noreferrer">Qingqing.Zhuo@amd.com</a>> Cc: amd-gfx mailing list <<a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank" rel="noreferrer">amd-gfx@lists.freedesktop.org</a>>; Mark Yacoub <<a href="mailto:markyacoub@chromium.org" target="_blank" rel="noreferrer">markyacoub@chromium.org</a>>; Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com" target="_blank" rel="noreferrer">Alexander.Deucher@amd.com</a>>; Wheeler, Daniel <<a href="mailto:Daniel.Wheeler@amd.com" target="_blank" rel="noreferrer">Daniel.Wheeler@amd.com</a>>; Siqueira, Rodrigo <<a href="mailto:Rodrigo.Siqueira@amd.com" target="_blank" rel="noreferrer">Rodrigo.Siqueira@amd.com</a>>; Kazlauskas, Nicholas <<a href="mailto:Nicholas.Kazlauskas@amd.com" target="_blank" rel="noreferrer">Nicholas.Kazlauskas@amd.com</a>> Subject: Re: [PATCH 1/2] drm/amd/display: Update modifier list for gfx10_3 </div> <div> <div> </div> <div> <div> On Thu, Apr 15, 2021 at 1:35 AM Qingqing Zhuo <<a href="mailto:qingqing.zhuo@amd.com" target="_blank" rel="noreferrer">qingqing.zhuo@amd.com</a>> wrote: </div> <blockquote style="border:none;border-left:solid #cccccc 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-top:5.0pt;margin-right:0in;margin-bottom:5.0pt"> [Why] Current list only includes modifiers where DCC_MAX_COMPRESSED_BLOCK is set to AMD_FMT_MOD_DCC_BLOCK_128B, while AMD_FMT_MOD_DCC_BLOCK_64B is also supported and used by userspace. [How] Add AMD_FMT_MOD_DCC_BLOCK_64B to modifiers with DCC supported. Signed-off-by: Qingqing Zhuo <<a href="mailto:qingqing.zhuo@amd.com" target="_blank" rel="noreferrer">qingqing.zhuo@amd.com</a>> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) 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 e29cb2e956db..c3cbc3d298e7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4535,6 +4535,17 @@ add_gfx10_3_modifiers(const struct amdgpu_device *adev, int pipe_xor_bits = ilog2(adev->gfx.config.gb_addr_config_fields.num_pipes); int pkrs = ilog2(adev->gfx.config.gb_addr_config_fields.num_pkrs); + add_modifier(mods, size, capacity, AMD_FMT_MOD | + AMD_FMT_MOD_SET(TILE, AMD_FMT_MOD_TILE_GFX9_64K_R_X) | + AMD_FMT_MOD_SET(TILE_VERSION, AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS) | + AMD_FMT_MOD_SET(PIPE_XOR_BITS, pipe_xor_bits) | + AMD_FMT_MOD_SET(PACKERS, pkrs) | + AMD_FMT_MOD_SET(DCC, 1) | + AMD_FMT_MOD_SET(DCC_CONSTANT_ENCODE, 1) | + AMD_FMT_MOD_SET(DCC_INDEPENDENT_64B, 1) | + AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, 1) | + AMD_FMT_MOD_SET(DCC_MAX_COMPRESSED_BLOCK, AMD_FMT_MOD_DCC_BLOCK_64B)); </blockquote> <div> </div> <div> Thanks for finding this issue. Looking at it it looks to me like the original entries are mistaken. Can we just change the DCC_MAX_COMPRESSED_BLOCK in the already existing DCC entries? Looks like Mesa always uses the AMD_FMT_MOD_DCC_BLOCK_64B anyway, and I don't think DCC_INDEPENDENT_64B=1 + DCC_MAX_COMPRESSED_BLOCK=AMD_FMT_MOD_DCC_BLOCK_128B makes sense. </div> <div> Thanks for the suggestion. Will send out an updated version soon. </div> <blockquote style="border:none;border-left:solid #cccccc 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-top:5.0pt;margin-right:0in;margin-bottom:5.0pt"> + add_modifier(mods, size, capacity, AMD_FMT_MOD | AMD_FMT_MOD_SET(TILE, AMD_FMT_MOD_TILE_GFX9_64K_R_X) | AMD_FMT_MOD_SET(TILE_VERSION, AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS) | @@ -4546,6 +4557,18 @@ add_gfx10_3_modifiers(const struct amdgpu_device *adev, AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, 1) | AMD_FMT_MOD_SET(DCC_MAX_COMPRESSED_BLOCK, AMD_FMT_MOD_DCC_BLOCK_128B)); + add_modifier(mods, size, capacity, AMD_FMT_MOD | + AMD_FMT_MOD_SET(TILE, AMD_FMT_MOD_TILE_GFX9_64K_R_X) | + AMD_FMT_MOD_SET(TILE_VERSION, AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS) | + AMD_FMT_MOD_SET(PIPE_XOR_BITS, pipe_xor_bits) | + AMD_FMT_MOD_SET(PACKERS, pkrs) | + AMD_FMT_MOD_SET(DCC, 1) | + AMD_FMT_MOD_SET(DCC_RETILE, 1) | + AMD_FMT_MOD_SET(DCC_CONSTANT_ENCODE, 1) | + AMD_FMT_MOD_SET(DCC_INDEPENDENT_64B, 1) | + AMD_FMT_MOD_SET(DCC_INDEPENDENT_128B, 1) | + AMD_FMT_MOD_SET(DCC_MAX_COMPRESSED_BLOCK, AMD_FMT_MOD_DCC_BLOCK_64B)); + add_modifier(mods, size, capacity, AMD_FMT_MOD | AMD_FMT_MOD_SET(TILE, AMD_FMT_MOD_TILE_GFX9_64K_R_X) | AMD_FMT_MOD_SET(TILE_VERSION, AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS) | -- 2.17.1 </blockquote> </div> </div> </div> </div> </blockquote></div>