<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:Calibri;font-size:10pt;color:#008000;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[Public]<br>
</p>
<br>
<div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Alex Deucher <alexander.deucher@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> Lazar, Lijo <Lijo.Lazar@amd.com><br>
<b>Sent:</b> Wednesday, February 5, 2025 2:50 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Zhang, Hawking <Hawking.Zhang@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: Clean up atom header file inclusion</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">atom bios header files are not required in these files.<br>
<br>
Signed-off-by: Lijo Lazar <lijo.lazar@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/soc15.c | 1 -<br>
drivers/gpu/drm/amd/amdgpu/soc24.c | 1 -<br>
21 files changed, 21 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c<br>
index ff5e52025266..6da8994e0469 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c<br>
@@ -28,7 +28,6 @@<br>
#include "amdgpu.h"<br>
#include "amdgpu_vm.h"<br>
#include "amdgpu_res_cursor.h"<br>
-#include "amdgpu_atomfirmware.h"<br>
#include "atom.h"<br>
<br>
#define AMDGPU_MAX_SG_SEGMENT_SIZE (2UL << 30)<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c<br>
index 89d17750af04..aabc5bacd154 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c<br>
@@ -29,7 +29,6 @@<br>
#include "amdgpu_gfx.h"<br>
#include "amdgpu_psp.h"<br>
#include "amdgpu_smu.h"<br>
-#include "amdgpu_atomfirmware.h"<br>
#include "imu_v11_0.h"<br>
#include "soc21.h"<br>
#include "nvd.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c<br>
index db5cc060de85..638507422f9b 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c<br>
@@ -29,7 +29,6 @@<br>
#include "amdgpu_gfx.h"<br>
#include "amdgpu_psp.h"<br>
#include "amdgpu_smu.h"<br>
-#include "amdgpu_atomfirmware.h"<br>
#include "imu_v12_0.h"<br>
#include "soc24.h"<br>
#include "nvd.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c<br>
index f53b379d8971..6028afd81690 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c<br>
@@ -27,7 +27,6 @@<br>
#include "amdgpu_gfx.h"<br>
#include "soc15.h"<br>
#include "soc15d.h"<br>
-#include "amdgpu_atomfirmware.h"<br>
#include "amdgpu_pm.h"<br>
<br>
#include "gc/gc_9_4_1_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c<br>
index 194026e9be33..f1dc13b3ab38 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "hdp_v4_0.h"<br>
#include "amdgpu_ras.h"<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c<br>
index d3962d469088..43195c079748 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "hdp_v5_0.h"<br>
<br>
#include "hdp/hdp_5_0_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c b/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c<br>
index f52552c5fa27..fcb8dd2876bc 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "hdp_v5_2.h"<br>
<br>
#include "hdp/hdp_5_2_1_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c<br>
index 6948fe9956ce..a88d25a06c29 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "hdp_v6_0.h"<br>
<br>
#include "hdp/hdp_6_0_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c<br>
index 63820329f67e..49f7eb4fbd11 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "hdp_v7_0.h"<br>
<br>
#include "hdp/hdp_7_0_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c b/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c<br>
index c92875ceb31f..9900fe5c3bc3 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbif_v6_3_1.h"<br>
<br>
#include "nbif/nbif_6_3_1_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c<br>
index 739fce4fa8fd..04041b398781 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v2_3.h"<br>
<br>
#include "nbio/nbio_2_3_default.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c<br>
index a54052dea8bf..f89e5f40e1a5 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v4_3.h"<br>
<br>
#include "nbio/nbio_4_3_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c<br>
index 34180c6070dd..e911368c1aeb 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v6_1.h"<br>
<br>
#include "nbio/nbio_6_1_default.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c<br>
index d1032e9992b4..1569a1e934ec 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_0.h"<br>
<br>
#include "nbio/nbio_7_0_default.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c<br>
index 41421da63a08..2ece3ae75ec1 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_11.h"<br>
<br>
#include "nbio/nbio_7_11_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c<br>
index a766e2d90cd0..acc5f363684a 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_2.h"<br>
<br>
#include "nbio/nbio_7_2_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c<br>
index a26a9be58eac..d5002ff931d8 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_4.h"<br>
#include "amdgpu_ras.h"<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c<br>
index 3fb6d2aa7e3b..2ee60b8746a6 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_7.h"<br>
<br>
#include "nbio/nbio_7_7_0_offset.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c<br>
index 8a0a63ac88d2..f23cb79110d6 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c<br>
@@ -21,7 +21,6 @@<br>
*<br>
*/<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "nbio_v7_9.h"<br>
#include "amdgpu_ras.h"<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
index 0e1daefd1a8e..6f8d867b290e 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
@@ -28,7 +28,6 @@<br>
#include <drm/amdgpu_drm.h><br>
<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "amdgpu_ih.h"<br>
#include "amdgpu_uvd.h"<br>
#include "amdgpu_vce.h"<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c b/drivers/gpu/drm/amd/amdgpu/soc24.c<br>
index 6b8e078ee7c7..69c5c8769395 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/soc24.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/soc24.c<br>
@@ -26,7 +26,6 @@<br>
#include <linux/pci.h><br>
<br>
#include "amdgpu.h"<br>
-#include "amdgpu_atombios.h"<br>
#include "amdgpu_ih.h"<br>
#include "amdgpu_uvd.h"<br>
#include "amdgpu_vce.h"<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>