diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-29 20:44:26 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-04-02 20:31:23 -0400 |
commit | 029a2edbd36f5e34ff1aebfba1bca31b5ac9899e (patch) | |
tree | f4bed655f9f3da2ec04cefc2c4872bf282004563 | |
parent | 5f3dbedf2770cf6aeb5547b3c56734dee4e5186b (diff) |
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 9d14eee3ed09..bc9d09dfa8e7 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) | |||
388 | DRM_INFO("Loading RS780 CP Microcode\n"); | 388 | DRM_INFO("Loading RS780 CP Microcode\n"); |
389 | for (i = 0; i < PM4_UCODE_SIZE; i++) { | 389 | for (i = 0; i < PM4_UCODE_SIZE; i++) { |
390 | RADEON_WRITE(R600_CP_ME_RAM_DATA, | 390 | RADEON_WRITE(R600_CP_ME_RAM_DATA, |
391 | RV670_cp_microcode[i][0]); | 391 | RS780_cp_microcode[i][0]); |
392 | RADEON_WRITE(R600_CP_ME_RAM_DATA, | 392 | RADEON_WRITE(R600_CP_ME_RAM_DATA, |
393 | RV670_cp_microcode[i][1]); | 393 | RS780_cp_microcode[i][1]); |
394 | RADEON_WRITE(R600_CP_ME_RAM_DATA, | 394 | RADEON_WRITE(R600_CP_ME_RAM_DATA, |
395 | RV670_cp_microcode[i][2]); | 395 | RS780_cp_microcode[i][2]); |
396 | } | 396 | } |
397 | 397 | ||
398 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); | 398 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); |
399 | DRM_INFO("Loading RS780 PFP Microcode\n"); | 399 | DRM_INFO("Loading RS780 PFP Microcode\n"); |
400 | for (i = 0; i < PFP_UCODE_SIZE; i++) | 400 | for (i = 0; i < PFP_UCODE_SIZE; i++) |
401 | RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]); | 401 | RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]); |
402 | } | 402 | } |
403 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); | 403 | RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0); |
404 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); | 404 | RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0); |