drm/radeon: switch SI to use radeon_ucode.h

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon_ucode.h b/drivers/gpu/drm/radeon/radeon_ucode.h
index 51beb4c00fc417c4d39b8071416736c9e378756a..4fe9237af83df0803478d5aab2adf74b6f681824 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ucode.h
+++ b/drivers/gpu/drm/radeon/radeon_ucode.h
@@ -32,6 +32,9 @@
 #define EVERGREEN_PM4_UCODE_SIZE     1376
 #define CAYMAN_PFP_UCODE_SIZE        2176
 #define CAYMAN_PM4_UCODE_SIZE        2176
+#define SI_PFP_UCODE_SIZE            2144
+#define SI_PM4_UCODE_SIZE            2144
+#define SI_CE_UCODE_SIZE             2144
 
 /* RLC */
 #define R600_RLC_UCODE_SIZE          768
@@ -39,10 +42,13 @@
 #define EVERGREEN_RLC_UCODE_SIZE     768
 #define CAYMAN_RLC_UCODE_SIZE        1024
 #define ARUBA_RLC_UCODE_SIZE         1536
+#define SI_RLC_UCODE_SIZE            2048
 
 /* MC */
 #define BTC_MC_UCODE_SIZE            6024
 #define CAYMAN_MC_UCODE_SIZE         6037
+#define SI_MC_UCODE_SIZE             7769
+#define OLAND_MC_UCODE_SIZE          7863
 
 /* SMC */
 #define RV770_SMC_UCODE_START        0x0100

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 660781b3d6d9d2a4efecf7c993a59349b1782389..7d797f4db360751c0ee05bdbcb45930976d99c96 100644 (file)
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -33,13 +33,8 @@
 #include "atom.h"
 #include "si_blit_shaders.h"
 #include "clearstate_si.h"
+#include "radeon_ucode.h"
 
-#define SI_PFP_UCODE_SIZE 2144
-#define SI_PM4_UCODE_SIZE 2144
-#define SI_CE_UCODE_SIZE 2144
-#define SI_RLC_UCODE_SIZE 2048
-#define SI_MC_UCODE_SIZE 7769
-#define OLAND_MC_UCODE_SIZE 7863
 
 MODULE_FIRMWARE("radeon/TAHITI_pfp.bin");
 MODULE_FIRMWARE("radeon/TAHITI_me.bin");