Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f862967 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/kms: remove r6xx+ blit copy routines 



No longer used now that we use the async dma engines or
CP DMA for bo copies.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8dddb993

drivers/gpu/drm/radeon/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \

	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \

	r200.o radeon_legacy_tv.o r600_cs.o r600_blit_shaders.o \

	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \

	evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \

	radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \

	evergreen.o evergreen_cs.o evergreen_blit_shaders.o \

	evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \

	atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \

	si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \

drivers/gpu/drm/radeon/cayman_blit_shaders.c

+0 −54
Original line number Diff line number Diff line
@@ -317,58 +317,4 @@ const u32 cayman_default_state[] = 
	0x00000010, /*  */

};



const u32 cayman_vs[] =

{

	0x00000004,

	0x80400400,

	0x0000a03c,

	0x95000688,

	0x00004000,

	0x15000688,

	0x00000000,

	0x88000000,

	0x04000000,

	0x67961001,

#ifdef __BIG_ENDIAN

	0x00020000,

#else

	0x00000000,

#endif

	0x00000000,

	0x04000000,

	0x67961000,

#ifdef __BIG_ENDIAN

	0x00020008,

#else

	0x00000008,

#endif

	0x00000000,

};



const u32 cayman_ps[] =

{

	0x00000004,

	0xa00c0000,

	0x00000008,

	0x80400000,

	0x00000000,

	0x95000688,

	0x00000000,

	0x88000000,

	0x00380400,

	0x00146b10,

	0x00380000,

	0x20146b10,

	0x00380400,

	0x40146b00,

	0x80380000,

	0x60146b00,

	0x00000010,

	0x000d1000,

	0xb0800000,

	0x00000000,

};



const u32 cayman_ps_size = ARRAY_SIZE(cayman_ps);

const u32 cayman_vs_size = ARRAY_SIZE(cayman_vs);

const u32 cayman_default_size = ARRAY_SIZE(cayman_default_state);

drivers/gpu/drm/radeon/evergreen.c

+0 −8
Original line number Diff line number Diff line
@@ -5144,13 +5144,6 @@ static int evergreen_startup(struct radeon_device *rdev) 
	}

	evergreen_gpu_init(rdev);



	r = evergreen_blit_init(rdev);

	if (r) {

		r600_blit_fini(rdev);

		rdev->asic->copy.copy = NULL;

		dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);

	}



	/* allocate rlc buffers */

	if (rdev->flags & RADEON_IS_IGP) {

		rdev->rlc.reg_list = sumo_rlc_save_restore_register_list;
@@ -5420,7 +5413,6 @@ int evergreen_init(struct radeon_device *rdev) 
void evergreen_fini(struct radeon_device *rdev)

{

	r600_audio_fini(rdev);

	r600_blit_fini(rdev);

	r700_cp_fini(rdev);

	r600_dma_fini(rdev);

	r600_irq_fini(rdev);

drivers/gpu/drm/radeon/evergreen_blit_kms.c

deleted100644 → 0
+0 −729

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/radeon/evergreen_blit_shaders.c

+0 −54

File changed.

Preview size limit exceeded, changes collapsed.