summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/ni.c
diff options
context:
space:
mode:
authorIlija Hadzic2011-10-13 05:29:41 +0200
committerDave Airlie2011-10-18 11:10:52 +0200
commitfb3d9e97e1ad5f2c19b68fe5a0c6a95bf57c65c3 (patch)
tree144cf1b5b2cd3acee7ebb2c5a199074cf01d1fb4 /drivers/gpu/drm/radeon/ni.c
parentdrm/radeon/kms: rename a variable for consistency (diff)
downloadkernel-qcow2-linux-fb3d9e97e1ad5f2c19b68fe5a0c6a95bf57c65c3.tar.gz
kernel-qcow2-linux-fb3d9e97e1ad5f2c19b68fe5a0c6a95bf57c65c3.tar.xz
kernel-qcow2-linux-fb3d9e97e1ad5f2c19b68fe5a0c6a95bf57c65c3.zip
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.c4
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)
r = evergreen_blit_init(rdev);
if (r) {
- evergreen_blit_fini(rdev);
+ r600_blit_fini(rdev);
rdev->asic->copy = NULL;
dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
}
@@ -1589,7 +1589,7 @@ int cayman_init(struct radeon_device *rdev)
void cayman_fini(struct radeon_device *rdev)
{
- evergreen_blit_fini(rdev);
+ r600_blit_fini(rdev);
cayman_cp_fini(rdev);
r600_irq_fini(rdev);
radeon_wb_fini(rdev);