diff options
author | Ilija Hadzic <ihadzic@research.bell-labs.com> | 2011-10-12 23:29:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 05:10:52 -0400 |
commit | fb3d9e97e1ad5f2c19b68fe5a0c6a95bf57c65c3 (patch) | |
tree | 144cf1b5b2cd3acee7ebb2c5a199074cf01d1fb4 /drivers/gpu/drm/radeon/ni.c | |
parent | b353096345f928d8c1164117804d1407790fb5f3 (diff) |
drm/radeon/kms: blit code commoning
factor out most of evergreen blit code and use the refactored code
from r600 that is now common for both r600 and evergreen
Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index b6c8a4880a86..b5da6dab5682 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1401,7 +1401,7 @@ static int cayman_startup(struct radeon_device *rdev) | |||
1401 | 1401 | ||
1402 | r = evergreen_blit_init(rdev); | 1402 | r = evergreen_blit_init(rdev); |
1403 | if (r) { | 1403 | if (r) { |
1404 | evergreen_blit_fini(rdev); | 1404 | r600_blit_fini(rdev); |
1405 | rdev->asic->copy = NULL; | 1405 | rdev->asic->copy = NULL; |
1406 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); | 1406 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); |
1407 | } | 1407 | } |
@@ -1589,7 +1589,7 @@ int cayman_init(struct radeon_device *rdev) | |||
1589 | 1589 | ||
1590 | void cayman_fini(struct radeon_device *rdev) | 1590 | void cayman_fini(struct radeon_device *rdev) |
1591 | { | 1591 | { |
1592 | evergreen_blit_fini(rdev); | 1592 | r600_blit_fini(rdev); |
1593 | cayman_cp_fini(rdev); | 1593 | cayman_cp_fini(rdev); |
1594 | r600_irq_fini(rdev); | 1594 | r600_irq_fini(rdev); |
1595 | radeon_wb_fini(rdev); | 1595 | radeon_wb_fini(rdev); |