From a42ef2d3a812aee25d8e9ba99b706c97367200d7 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 8 Mar 2013 10:13:40 -0500 Subject: [PATCH] --- yaml --- r: 371407 b: refs/heads/master c: 0363a559728e539051e29765f08f312c7b1dfde3 h: refs/heads/master i: 371405: b7d242c600cadc451db959b45268fbd88b03e2f1 371403: bf8715621a86e35d5ea422878bfc8566d3872ed3 371399: 0204426284e6e0652da859c7d027f9f2f25f3855 371391: 2248b2d06ad4761f439c61e12a5a082e75956fbe v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/si.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c7a70932c832..2602868a79ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a21059dc4c0e80f2eebcb0a9096721ef1dc9c9d +refs/heads/master: 0363a559728e539051e29765f08f312c7b1dfde3 diff --git a/trunk/drivers/gpu/drm/radeon/si.c b/trunk/drivers/gpu/drm/radeon/si.c index e9663200cac7..7eda8303379f 100644 --- a/trunk/drivers/gpu/drm/radeon/si.c +++ b/trunk/drivers/gpu/drm/radeon/si.c @@ -4286,14 +4286,6 @@ static int si_startup(struct radeon_device *rdev) return r; si_gpu_init(rdev); -#if 0 - r = evergreen_blit_init(rdev); - if (r) { - r600_blit_fini(rdev); - rdev->asic->copy = NULL; - dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); - } -#endif /* allocate rlc buffers */ r = si_rlc_init(rdev); if (r) { @@ -4589,9 +4581,6 @@ int si_init(struct radeon_device *rdev) void si_fini(struct radeon_device *rdev) { -#if 0 - r600_blit_fini(rdev); -#endif si_cp_fini(rdev); cayman_dma_fini(rdev); si_irq_fini(rdev);