<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, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Maybe just squash this into one patch? Either way series is:<br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Acked-by: Alex Deucher <alexander.deucher@amd.com><br> </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 Anson Jacob <Anson.Jacob@amd.com><br> <b>Sent:</b> Wednesday, March 10, 2021 10:26 AM<br> <b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Cc:</b> Jacob, Anson <Anson.Jacob@amd.com>; Zhang Yunkai <zhang.yunkai@zte.com.cn><br> <b>Subject:</b> [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">'drm/drm_hdcp.h' included in 'amdgpu_dm.c' is duplicated.<br> <br> Reported-by: Zhang Yunkai <zhang.yunkai@zte.com.cn><br> Signed-off-by: Anson Jacob <Anson.Jacob@amd.com><br> ---<br> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -<br> 1 file changed, 1 deletion(-)<br> <br> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br> index b5a75c73ad71..f9513c5ca2b8 100644<br> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br> @@ -76,7 +76,6 @@<br> #include <drm/drm_edid.h><br> #include <drm/drm_vblank.h><br> #include <drm/drm_audio_component.h><br> -#include <drm/drm_hdcp.h><br> <br> #if defined(CONFIG_DRM_AMD_DC_DCN)<br> #include "ivsrcid/dcn/irqsrcs_dcn_1_0.h"<br> -- <br> 2.25.1<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%7Calexander.deucher%40amd.com%7Cdd52479bfffd40b27d9e08d8e3d8dbb0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637509867847855120%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=pJYigzOJYdGcIGSlfFG41GkPNRc%2BipBcRF5KDIcHL1I%3D&reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7Cdd52479bfffd40b27d9e08d8e3d8dbb0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637509867847855120%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=pJYigzOJYdGcIGSlfFG41GkPNRc%2BipBcRF5KDIcHL1I%3D&reserved=0</a><br> </div> </span></font></div> </div> </body> </html>