diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-29 20:44:26 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:31:23 +1000 |
commit | 029a2edbd36f5e34ff1aebfba1bca31b5ac9899e (patch) | |
tree | f4bed655f9f3da2ec04cefc2c4872bf282004563 | |
parent | 5f3dbedf2770cf6aeb5547b3c56734dee4e5186b (diff) | |
download | linux-3.10-029a2edbd36f5e34ff1aebfba1bca31b5ac9899e.tar.gz linux-3.10-029a2edbd36f5e34ff1aebfba1bca31b5ac9899e.tar.bz2 linux-3.10-029a2edbd36f5e34ff1aebfba1bca31b5ac9899e.zip |
drm/radeon: load the right microcode on rs780
Copy/paste error. The RV670 microcode should work ok, so it's
not a show stopper.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 9d14eee3ed0..bc9d09dfa8e 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -388,17 +388,17 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv) DRM_INFO("Loading RS780 CP Microcode\n"); for (i = 0; i < PM4_UCODE_SIZE; i++) { RADEON_WRITE(R600_CP_ME_RAM_DATA, - RV670_cp_microcode[i][0]); + RS780_cp_microcode[i][0]); RADEON_WRITE(R600_CP_ME_RAM_DATA, - RV670_cp_microcode[i][1]); + RS780_cp_microcode[i][1]); RADEON_WRITE(R600_CP_ME_RAM_DATA, - RV670_cp_microcode[i][2]); + RS780_cp_microcode[i][2]); } RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); DRM_INFO("Loading RS780 PFP Microcode\n"); for (i = 0; i < PFP_UCODE_SIZE; i++) - RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]); + RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]); } RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); |