diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-01-08 15:58:49 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-01-10 22:42:27 -0500 |
commit | 804c7559e9376c3ba78ae15a30337b1e24f8ae80 (patch) | |
tree | 3b7791d1b006e2ab3566fec6996f9aee67b6099f /drivers/gpu/drm/radeon/r420.c | |
parent | 003e69f9862bcda89a75c27750efdbc17ac02945 (diff) |
drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx
- r4xx/rs6xx: add support for extended pixel shader
instruction/temp regs
- r5xx: add SM3 regs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 1d4d16ed7db1..053404e71a9d 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
@@ -32,6 +32,13 @@ | |||
32 | #include "atom.h" | 32 | #include "atom.h" |
33 | #include "r100d.h" | 33 | #include "r100d.h" |
34 | #include "r420d.h" | 34 | #include "r420d.h" |
35 | #include "r420_reg_safe.h" | ||
36 | |||
37 | static void r420_set_reg_safe(struct radeon_device *rdev) | ||
38 | { | ||
39 | rdev->config.r300.reg_safe_bm = r420_reg_safe_bm; | ||
40 | rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(r420_reg_safe_bm); | ||
41 | } | ||
35 | 42 | ||
36 | int r420_mc_init(struct radeon_device *rdev) | 43 | int r420_mc_init(struct radeon_device *rdev) |
37 | { | 44 | { |
@@ -378,7 +385,7 @@ int r420_init(struct radeon_device *rdev) | |||
378 | if (r) | 385 | if (r) |
379 | return r; | 386 | return r; |
380 | } | 387 | } |
381 | r300_set_reg_safe(rdev); | 388 | r420_set_reg_safe(rdev); |
382 | rdev->accel_working = true; | 389 | rdev->accel_working = true; |
383 | r = r420_startup(rdev); | 390 | r = r420_startup(rdev); |
384 | if (r) { | 391 | if (r) { |