<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <p style="font-family:Arial;font-size:11pt;color:#0078D7;margin:5pt;" align="Left"> [AMD Official Use Only - Internal Distribution Only]<br> </p> <br> <div> <div style="font-family: Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Reviewed-by: Slava Abramov <slava.abramov@amd.com></div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com><br> <b>Sent:</b> Monday, October 26, 2020 11:57 AM<br> <b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Cc:</b> Deucher, Alexander <Alexander.Deucher@amd.com><br> <b>Subject:</b> [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">Updating these were missed.<br> <br> Fixes: 2c8193fc72b1c5 ("drm/amd/display: Refactor ABM_MASK_SH_LIST_DCN301 naming")<br> Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br> ---<br> drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 4 ++--<br> drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 4 ++--<br> 2 files changed, 4 insertions(+), 4 deletions(-)<br> <br> diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c<br> index fe46a0b911fc..5a47b4106b7b 100644<br> --- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c<br> +++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c<br> @@ -363,11 +363,11 @@ static const struct dce_abm_registers abm_regs[] = {<br> };<br> <br> static const struct dce_abm_shift abm_shift = {<br> - ABM_MASK_SH_LIST_DCN301(__SHIFT)<br> + ABM_MASK_SH_LIST_DCN30(__SHIFT)<br> };<br> <br> static const struct dce_abm_mask abm_mask = {<br> - ABM_MASK_SH_LIST_DCN301(_MASK)<br> + ABM_MASK_SH_LIST_DCN30(_MASK)<br> };<br> <br> #define audio_regs(id)\<br> diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c<br> index 38e807f22060..c4ffed95d35e 100644<br> --- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c<br> +++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c<br> @@ -1276,11 +1276,11 @@ static const struct dce_abm_registers abm_regs[] = {<br> };<br> <br> static const struct dce_abm_shift abm_shift = {<br> - ABM_MASK_SH_LIST_DCN301(__SHIFT)<br> + ABM_MASK_SH_LIST_DCN30(__SHIFT)<br> };<br> <br> static const struct dce_abm_mask abm_mask = {<br> - ABM_MASK_SH_LIST_DCN301(_MASK)<br> + ABM_MASK_SH_LIST_DCN30(_MASK)<br> };<br> <br> static bool dcn302_resource_construct(<br> -- <br> 2.25.4<br> <br> _______________________________________________<br> amd-gfx mailing list<br> amd-gfx@lists.freedesktop.org<br> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cslava.abramov%40amd.com%7C12c425e35e00433fc62808d879c7e660%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637393246821297231%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=jZx1%2ByKkYSfL3IO%2B7Eo0GQrX%2FQRsADRb1u33y6VxayY%3D&reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cslava.abramov%40amd.com%7C12c425e35e00433fc62808d879c7e660%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637393246821297231%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=jZx1%2ByKkYSfL3IO%2B7Eo0GQrX%2FQRsADRb1u33y6VxayY%3D&reserved=0</a><br> </div> </span></font></div> </div> </body> </html>