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

Commit 0b3b4fea authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: remove useless clock code 



This code was originally for forcing some clocks on certain asics.
However, this code was later moved to asic specific functions
for all of the affected asics.  The only users of the original
code at this point were r600, rv770, and evergreen and the code
was not relevant for those asics.  So, remove it.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 87cbf8f2

drivers/gpu/drm/radeon/evergreen.c

+0 −9
Original line number Diff line number Diff line
@@ -2054,11 +2054,6 @@ int evergreen_resume(struct radeon_device *rdev) 
	 */

	/* post card */

	atom_asic_init(rdev->mode_info.atom_context);

	/* Initialize clocks */

	r = radeon_clocks_init(rdev);

	if (r) {

		return r;

	}



	r = evergreen_startup(rdev);

	if (r) {
@@ -2164,9 +2159,6 @@ int evergreen_init(struct radeon_device *rdev) 
	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	r = radeon_clocks_init(rdev);

	if (r)

		return r;

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	if (r)
@@ -2236,7 +2228,6 @@ void evergreen_fini(struct radeon_device *rdev) 
	evergreen_pcie_gart_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_clocks_fini(rdev);

	radeon_agp_fini(rdev);

	radeon_bo_fini(rdev);

	radeon_atombios_fini(rdev);

drivers/gpu/drm/radeon/r600.c

+0 −9
Original line number Diff line number Diff line
@@ -2489,11 +2489,6 @@ int r600_resume(struct radeon_device *rdev) 
	 */

	/* post card */

	atom_asic_init(rdev->mode_info.atom_context);

	/* Initialize clocks */

	r = radeon_clocks_init(rdev);

	if (r) {

		return r;

	}



	r = r600_startup(rdev);

	if (r) {
@@ -2586,9 +2581,6 @@ int r600_init(struct radeon_device *rdev) 
	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	r = radeon_clocks_init(rdev);

	if (r)

		return r;

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	if (r)
@@ -2663,7 +2655,6 @@ void r600_fini(struct radeon_device *rdev) 
	radeon_agp_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_clocks_fini(rdev);

	radeon_bo_fini(rdev);

	radeon_atombios_fini(rdev);

	kfree(rdev->bios);

drivers/gpu/drm/radeon/radeon.h

+0 −2
Original line number Diff line number Diff line
@@ -1339,8 +1339,6 @@ extern bool radeon_card_posted(struct radeon_device *rdev); 
extern void radeon_update_bandwidth_info(struct radeon_device *rdev);

extern void radeon_update_display_priority(struct radeon_device *rdev);

extern bool radeon_boot_test_post_card(struct radeon_device *rdev);

extern int radeon_clocks_init(struct radeon_device *rdev);

extern void radeon_clocks_fini(struct radeon_device *rdev);

extern void radeon_scratch_init(struct radeon_device *rdev);

extern void radeon_surface_init(struct radeon_device *rdev);

extern int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data);

drivers/gpu/drm/radeon/radeon_asic.c

+0 −18
Original line number Diff line number Diff line
@@ -858,21 +858,3 @@ int radeon_asic_init(struct radeon_device *rdev) 
	return 0;

}

/*

 * Wrapper around modesetting bits. Move to radeon_clocks.c?

 */

int radeon_clocks_init(struct radeon_device *rdev)

{

	int r;



	r = radeon_static_clocks_init(rdev->ddev);

	if (r) {

		return r;

	}

	DRM_INFO("Clocks initialized !\n");

	return 0;

}



void radeon_clocks_fini(struct radeon_device *rdev)

{

}

drivers/gpu/drm/radeon/radeon_clocks.c

+0 −50
Original line number Diff line number Diff line
@@ -905,53 +905,3 @@ void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enable) 
	}

}

static void radeon_apply_clock_quirks(struct radeon_device *rdev)

{

	uint32_t tmp;



	/* XXX make sure engine is idle */



	if (rdev->family < CHIP_RS600) {

		tmp = RREG32_PLL(RADEON_SCLK_CNTL);

		if (ASIC_IS_R300(rdev) || ASIC_IS_RV100(rdev))

			tmp |= RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_VIP;

		if ((rdev->family == CHIP_RV250)

		    || (rdev->family == CHIP_RV280))

			tmp |=

			    RADEON_SCLK_FORCE_DISP1 | RADEON_SCLK_FORCE_DISP2;

		if ((rdev->family == CHIP_RV350)

		    || (rdev->family == CHIP_RV380))

			tmp |= R300_SCLK_FORCE_VAP;

		if (rdev->family == CHIP_R420)

			tmp |= R300_SCLK_FORCE_PX | R300_SCLK_FORCE_TX;

		WREG32_PLL(RADEON_SCLK_CNTL, tmp);

	} else if (rdev->family < CHIP_R600) {

		tmp = RREG32_PLL(AVIVO_CP_DYN_CNTL);

		tmp |= AVIVO_CP_FORCEON;

		WREG32_PLL(AVIVO_CP_DYN_CNTL, tmp);



		tmp = RREG32_PLL(AVIVO_E2_DYN_CNTL);

		tmp |= AVIVO_E2_FORCEON;

		WREG32_PLL(AVIVO_E2_DYN_CNTL, tmp);



		tmp = RREG32_PLL(AVIVO_IDCT_DYN_CNTL);

		tmp |= AVIVO_IDCT_FORCEON;

		WREG32_PLL(AVIVO_IDCT_DYN_CNTL, tmp);

	}

}



int radeon_static_clocks_init(struct drm_device *dev)

{

	struct radeon_device *rdev = dev->dev_private;



	/* XXX make sure engine is idle */



	if (radeon_dynclks != -1) {

		if (radeon_dynclks) {

			if (rdev->asic->set_clock_gating)

				radeon_set_clock_gating(rdev, 1);

		}

	}

	radeon_apply_clock_quirks(rdev);

	return 0;

}