diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-08-06 21:36:58 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:38:07 +1000 |
| commit | b70d6bb3f67b2e2964abafb0117f1733f062cba5 (patch) | |
| tree | 89a8b90694b85905d6731c1280910e30fb9881ab /drivers/gpu/drm/radeon/r600.c | |
| parent | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (diff) | |
| download | lwn-b70d6bb3f67b2e2964abafb0117f1733f062cba5.tar.gz lwn-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/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 7a04959ba0ee..927509ff349a 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2426,19 +2426,7 @@ int r600_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) { - dev_err(rdev->dev, "(%d) pin blit object failed\n", r); - return r; - } - } + /* Enable IRQ */ r = r600_irq_init(rdev); if (r) { |