summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rv770.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-08-06 21:36:58 -0400
committerDave Airlie <airlied@redhat.com>2010-10-06 11:38:07 +1000
commitb70d6bb3f67b2e2964abafb0117f1733f062cba5 (patch)
tree89a8b90694b85905d6731c1280910e30fb9881ab /drivers/gpu/drm/radeon/rv770.c
parentfb7ba2114bcd8bb51640c20bc68f89164b29b9ed (diff)
downloadblackbird-op-linux-b70d6bb3f67b2e2964abafb0117f1733f062cba5.tar.gz
blackbird-op-linux-b70d6bb3f67b2e2964abafb0117f1733f062cba5.zip
drm/radeon/kms: clean up r6xx/r7xx blit init (v2)
Move common code to init function. v2: make sure the bo is pinned after init as well. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
-rw-r--r--drivers/gpu/drm/radeon/rv770.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index bfa59db374d2..bc2beb7d35e9 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1028,19 +1028,7 @@ static int rv770_startup(struct radeon_device *rdev)
rdev->asic->copy = NULL;
dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
}
- /* pin copy shader into vram */
- if (rdev->r600_blit.shader_obj) {
- r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
- if (unlikely(r != 0))
- return r;
- r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
- &rdev->r600_blit.shader_gpu_addr);
- radeon_bo_unreserve(rdev->r600_blit.shader_obj);
- if (r) {
- DRM_ERROR("failed to pin blit object %d\n", r);
- return r;
- }
- }
+
/* Enable IRQ */
r = r600_irq_init(rdev);
if (r) {
OpenPOWER on IntegriCloud