diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2011-01-06 21:19:31 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-01-06 23:11:40 -0500 |
commit | 0af62b0168043896a042b005ff88caa77dd94d04 (patch) | |
tree | 1e64c1dcafd80f53f16172955c41d40122b00117 /drivers/gpu/drm/radeon/radeon.h | |
parent | fee298fd6f3d8bde5fc2912192d026c78ba81982 (diff) |
drm/radeon/kms: add ucode loader for NI
The MC ucode is no longer loaded by the vbios
tables as on previous asics. It now must be loaded
by the driver.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 8c62b2f5892..da21105488d 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -1152,6 +1152,7 @@ struct radeon_device { | |||
1152 | const struct firmware *me_fw; /* all family ME firmware */ | 1152 | const struct firmware *me_fw; /* all family ME firmware */ |
1153 | const struct firmware *pfp_fw; /* r6/700 PFP firmware */ | 1153 | const struct firmware *pfp_fw; /* r6/700 PFP firmware */ |
1154 | const struct firmware *rlc_fw; /* r6/700 RLC firmware */ | 1154 | const struct firmware *rlc_fw; /* r6/700 RLC firmware */ |
1155 | const struct firmware *mc_fw; /* NI MC firmware */ | ||
1155 | struct r600_blit r600_blit; | 1156 | struct r600_blit r600_blit; |
1156 | struct r700_vram_scratch vram_scratch; | 1157 | struct r700_vram_scratch vram_scratch; |
1157 | int msi_enabled; /* msi enabled */ | 1158 | int msi_enabled; /* msi enabled */ |
@@ -1561,6 +1562,9 @@ extern int evergreen_irq_set(struct radeon_device *rdev); | |||
1561 | extern int evergreen_blit_init(struct radeon_device *rdev); | 1562 | extern int evergreen_blit_init(struct radeon_device *rdev); |
1562 | extern void evergreen_blit_fini(struct radeon_device *rdev); | 1563 | extern void evergreen_blit_fini(struct radeon_device *rdev); |
1563 | 1564 | ||
1565 | extern int ni_init_microcode(struct radeon_device *rdev); | ||
1566 | extern int btc_mc_load_microcode(struct radeon_device *rdev); | ||
1567 | |||
1564 | /* radeon_acpi.c */ | 1568 | /* radeon_acpi.c */ |
1565 | #if defined(CONFIG_ACPI) | 1569 | #if defined(CONFIG_ACPI) |
1566 | extern int radeon_acpi_init(struct radeon_device *rdev); | 1570 | extern int radeon_acpi_init(struct radeon_device *rdev); |