All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Revert "drm/amd/display: remove duplicate include in amdgpu_dm.c"
@ 2021-03-10 15:26 Anson Jacob
  2021-03-10 15:26 ` [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c Anson Jacob
  0 siblings, 1 reply; 3+ messages in thread
From: Anson Jacob @ 2021-03-10 15:26 UTC (permalink / raw)
  To: amd-gfx; +Cc: Anson Jacob

This reverts commit 92ca4810b82ff3ca7791114c8b7c161f3c58b4de.

The duplicate from #79 should be removes instead.
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
 1 file changed, 1 insertion(+)

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 2506e85a19b6..b5a75c73ad71 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -45,6 +45,7 @@
 #include "amdgpu_dm.h"
 #ifdef CONFIG_DRM_AMD_DC_HDCP
 #include "amdgpu_dm_hdcp.h"
+#include <drm/drm_hdcp.h>
 #endif
 #include "amdgpu_pm.h"
 
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c
  2021-03-10 15:26 [PATCH 1/2] Revert "drm/amd/display: remove duplicate include in amdgpu_dm.c" Anson Jacob
@ 2021-03-10 15:26 ` Anson Jacob
  2021-03-10 15:29   ` Deucher, Alexander
  0 siblings, 1 reply; 3+ messages in thread
From: Anson Jacob @ 2021-03-10 15:26 UTC (permalink / raw)
  To: amd-gfx; +Cc: Anson Jacob, Zhang Yunkai

'drm/drm_hdcp.h' included in 'amdgpu_dm.c' is duplicated.

Reported-by: Zhang Yunkai <zhang.yunkai@zte.com.cn>
Signed-off-by: Anson Jacob <Anson.Jacob@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
 1 file changed, 1 deletion(-)

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 b5a75c73ad71..f9513c5ca2b8 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -76,7 +76,6 @@
 #include <drm/drm_edid.h>
 #include <drm/drm_vblank.h>
 #include <drm/drm_audio_component.h>
-#include <drm/drm_hdcp.h>
 
 #if defined(CONFIG_DRM_AMD_DC_DCN)
 #include "ivsrcid/dcn/irqsrcs_dcn_1_0.h"
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c
  2021-03-10 15:26 ` [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c Anson Jacob
@ 2021-03-10 15:29   ` Deucher, Alexander
  0 siblings, 0 replies; 3+ messages in thread
From: Deucher, Alexander @ 2021-03-10 15:29 UTC (permalink / raw)
  To: Jacob, Anson, amd-gfx; +Cc: Zhang Yunkai


[-- Attachment #1.1: Type: text/plain, Size: 1889 bytes --]

[AMD Official Use Only - Internal Distribution Only]

Maybe just squash this into one patch?  Either way series is:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Anson Jacob <Anson.Jacob@amd.com>
Sent: Wednesday, March 10, 2021 10:26 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Jacob, Anson <Anson.Jacob@amd.com>; Zhang Yunkai <zhang.yunkai@zte.com.cn>
Subject: [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c

'drm/drm_hdcp.h' included in 'amdgpu_dm.c' is duplicated.

Reported-by: Zhang Yunkai <zhang.yunkai@zte.com.cn>
Signed-off-by: Anson Jacob <Anson.Jacob@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
 1 file changed, 1 deletion(-)

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 b5a75c73ad71..f9513c5ca2b8 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -76,7 +76,6 @@
 #include <drm/drm_edid.h>
 #include <drm/drm_vblank.h>
 #include <drm/drm_audio_component.h>
-#include <drm/drm_hdcp.h>

 #if defined(CONFIG_DRM_AMD_DC_DCN)
 #include "ivsrcid/dcn/irqsrcs_dcn_1_0.h"
--
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Calexander.deucher%40amd.com%7Cdd52479bfffd40b27d9e08d8e3d8dbb0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637509867847855120%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=pJYigzOJYdGcIGSlfFG41GkPNRc%2BipBcRF5KDIcHL1I%3D&amp;reserved=0

[-- Attachment #1.2: Type: text/html, Size: 3543 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-10 15:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-10 15:26 [PATCH 1/2] Revert "drm/amd/display: remove duplicate include in amdgpu_dm.c" Anson Jacob
2021-03-10 15:26 ` [PATCH 2/2] drm/amd/display: remove duplicate include in amdgpu_dm.c Anson Jacob
2021-03-10 15:29   ` Deucher, Alexander

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.