diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-03-27 15:18:04 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-06-27 19:16:53 -0400 |
| commit | a0ceada6b4da18e8539bc3229adae3dc9b05d9a2 (patch) | |
| tree | 4ad1ed93dd4a087ce4f4bba6418ea7328ec46505 /drivers | |
| parent | ac1633876f8e907c4be40f3299a4eed9c85b3d18 (diff) | |
| download | blackbird-op-linux-a0ceada6b4da18e8539bc3229adae3dc9b05d9a2.tar.gz blackbird-op-linux-a0ceada6b4da18e8539bc3229adae3dc9b05d9a2.zip | |
drm/radeon: switch SI to use radeon_ucode.h
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ucode.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ucode.h b/drivers/gpu/drm/radeon/radeon_ucode.h index 51beb4c00fc4..4fe9237af83d 100644 --- 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 660781b3d6d9..7d797f4db360 100644 --- 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"); |
