Commit ef0e6e65 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: add set_uvd_clocks callback for r7xx v3 



v2: avoid 64bit divide
v3: rv740 uses the evegreen upll configuration

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
parent 2539eb02

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ static struct radeon_asic rv770_asic = { 
		.get_pcie_lanes = &r600_get_pcie_lanes,

		.set_pcie_lanes = &r600_set_pcie_lanes,

		.set_clock_gating = &radeon_atom_set_clock_gating,

		.set_uvd_clocks = &rv770_set_uvd_clocks,

	},

	.pflip = {

		.pre_page_flip = &rs600_pre_page_flip,

drivers/gpu/drm/radeon/radeon_asic.h

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ int rv770_copy_dma(struct radeon_device *rdev, 
		   struct radeon_fence **fence);

u32 rv770_get_xclk(struct radeon_device *rdev);

int rv770_uvd_resume(struct radeon_device *rdev);

int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk);



/*

 * evergreen

drivers/gpu/drm/radeon/rv770.c

+156 −0
Original line number Diff line number Diff line
@@ -42,6 +42,162 @@ 
static void rv770_gpu_init(struct radeon_device *rdev);

void rv770_fini(struct radeon_device *rdev);

static void rv770_pcie_gen2_enable(struct radeon_device *rdev);

int evergreen_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk);



static int rv770_uvd_calc_post_div(unsigned target_freq,

				   unsigned vco_freq,

				   unsigned *div)

{

	/* Fclk = Fvco / PDIV */

	*div = vco_freq / target_freq;



	/* we alway need a frequency less than or equal the target */

	if ((vco_freq / *div) > target_freq)

		*div += 1;



	/* out of range ? */

	if (*div > 30)

		return -1; /* forget it */



	*div -= 1;

	return vco_freq / (*div + 1);

}



static int rv770_uvd_send_upll_ctlreq(struct radeon_device *rdev)

{

	unsigned i;



	/* assert UPLL_CTLREQ */

	WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_CTLREQ_MASK, ~UPLL_CTLREQ_MASK);



	/* wait for CTLACK and CTLACK2 to get asserted */

	for (i = 0; i < 100; ++i) {

		uint32_t mask = UPLL_CTLACK_MASK | UPLL_CTLACK2_MASK;

		if ((RREG32(CG_UPLL_FUNC_CNTL) & mask) == mask)

			break;

		mdelay(10);

	}

	if (i == 100)

		return -ETIMEDOUT;



	/* deassert UPLL_CTLREQ */

	WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_CTLREQ_MASK);



	return 0;

}



int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)

{

	/* start off with something large */

	int optimal_diff_score = 0x7FFFFFF;

	unsigned optimal_fb_div = 0, optimal_vclk_div = 0;

	unsigned optimal_dclk_div = 0, optimal_vco_freq = 0;

	unsigned vco_freq, vco_min = 50000, vco_max = 160000;

	unsigned ref_freq = rdev->clock.spll.reference_freq;

	int r;



	/* RV740 uses evergreen uvd clk programming */

	if (rdev->family == CHIP_RV740)

		return evergreen_set_uvd_clocks(rdev, vclk, dclk);



	/* loop through vco from low to high */

	vco_min = max(max(vco_min, vclk), dclk);

	for (vco_freq = vco_min; vco_freq <= vco_max; vco_freq += 500) {

		uint64_t fb_div = (uint64_t)vco_freq * 43663;

		int calc_clk, diff_score, diff_vclk, diff_dclk;

		unsigned vclk_div, dclk_div;



		do_div(fb_div, ref_freq);

		fb_div |= 1;



		/* fb div out of range ? */

		if (fb_div > 0x03FFFFFF)

			break; /* it can oly get worse */



		/* calc vclk with current vco freq. */

		calc_clk = rv770_uvd_calc_post_div(vclk, vco_freq, &vclk_div);

		if (calc_clk == -1)

			break; /* vco is too big, it has to stop. */

		diff_vclk = vclk - calc_clk;



		/* calc dclk with current vco freq. */

		calc_clk = rv770_uvd_calc_post_div(dclk, vco_freq, &dclk_div);

		if (calc_clk == -1)

			break; /* vco is too big, it has to stop. */

		diff_dclk = dclk - calc_clk;



		/* determine if this vco setting is better than current optimal settings */

		diff_score = abs(diff_vclk) + abs(diff_dclk);

		if (diff_score < optimal_diff_score) {

			optimal_fb_div = fb_div;

			optimal_vclk_div = vclk_div;

			optimal_dclk_div = dclk_div;

			optimal_vco_freq = vco_freq;

			optimal_diff_score = diff_score;

			if (optimal_diff_score == 0)

				break; /* it can't get better than this */

		}

	}



	/* bypass vclk and dclk with bclk */

	WREG32_P(CG_UPLL_FUNC_CNTL_2,

		 VCLK_SRC_SEL(1) | DCLK_SRC_SEL(1),

		 ~(VCLK_SRC_SEL_MASK | DCLK_SRC_SEL_MASK));



	/* set UPLL_FB_DIV to 0x50000 */

	WREG32_P(CG_UPLL_FUNC_CNTL_3, UPLL_FB_DIV(0x50000), ~UPLL_FB_DIV_MASK);



	/* deassert UPLL_RESET */

	WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_RESET_MASK);



	/* assert BYPASS EN and FB_DIV[0] <- ??? why? */

	WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_BYPASS_EN_MASK, ~UPLL_BYPASS_EN_MASK);

	WREG32_P(CG_UPLL_FUNC_CNTL_3, UPLL_FB_DIV(1), ~UPLL_FB_DIV(1));



	r = rv770_uvd_send_upll_ctlreq(rdev);

	if (r)

		return r;



	/* assert PLL_RESET */

	WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_RESET_MASK, ~UPLL_RESET_MASK);



	/* set the required FB_DIV, REF_DIV, Post divder values */

	WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_REF_DIV(1), ~UPLL_REF_DIV_MASK);

	WREG32_P(CG_UPLL_FUNC_CNTL_2,

		 UPLL_SW_HILEN(optimal_vclk_div >> 1) |

		 UPLL_SW_LOLEN((optimal_vclk_div >> 1) + (optimal_vclk_div & 1)) |

		 UPLL_SW_HILEN2(optimal_dclk_div >> 1) |

		 UPLL_SW_LOLEN2((optimal_dclk_div >> 1) + (optimal_dclk_div & 1)),

		 ~UPLL_SW_MASK);



	WREG32_P(CG_UPLL_FUNC_CNTL_3, UPLL_FB_DIV(optimal_fb_div),

		 ~UPLL_FB_DIV_MASK);



	/* give the PLL some time to settle */

	mdelay(15);



	/* deassert PLL_RESET */

	WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_RESET_MASK);



	mdelay(15);



	/* deassert BYPASS EN and FB_DIV[0] <- ??? why? */

	WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_BYPASS_EN_MASK);

	WREG32_P(CG_UPLL_FUNC_CNTL_3, 0, ~UPLL_FB_DIV(1));



	r = rv770_uvd_send_upll_ctlreq(rdev);

	if (r)

		return r;



	/* switch VCLK and DCLK selection */

	WREG32_P(CG_UPLL_FUNC_CNTL_2,

		 VCLK_SRC_SEL(2) | DCLK_SRC_SEL(2),

		 ~(VCLK_SRC_SEL_MASK | DCLK_SRC_SEL_MASK));



	mdelay(100);



	return 0;

}



#define PCIE_BUS_CLK                10000

#define TCLK                        (PCIE_BUS_CLK / 10)

drivers/gpu/drm/radeon/rv770d.h

+24 −0
Original line number Diff line number Diff line
@@ -38,6 +38,30 @@ 
#define R7XX_MAX_PIPES             8

#define R7XX_MAX_PIPES_MASK        0xff



/* discrete uvd clocks */

#define CG_UPLL_FUNC_CNTL				0x718

#	define UPLL_RESET_MASK				0x00000001

#	define UPLL_SLEEP_MASK				0x00000002

#	define UPLL_BYPASS_EN_MASK			0x00000004

#	define UPLL_CTLREQ_MASK				0x00000008

#	define UPLL_REF_DIV(x)				((x) << 16)

#	define UPLL_REF_DIV_MASK			0x001F0000

#	define UPLL_CTLACK_MASK				0x40000000

#	define UPLL_CTLACK2_MASK			0x80000000

#define CG_UPLL_FUNC_CNTL_2				0x71c

#	define UPLL_SW_HILEN(x)				((x) << 0)

#	define UPLL_SW_LOLEN(x)				((x) << 4)

#	define UPLL_SW_HILEN2(x)			((x) << 8)

#	define UPLL_SW_LOLEN2(x)			((x) << 12)

#	define UPLL_SW_MASK				0x0000FFFF

#	define VCLK_SRC_SEL(x)				((x) << 20)

#	define VCLK_SRC_SEL_MASK			0x01F00000

#	define DCLK_SRC_SEL(x)				((x) << 25)

#	define DCLK_SRC_SEL_MASK			0x3E000000

#define CG_UPLL_FUNC_CNTL_3				0x720

#	define UPLL_FB_DIV(x)				((x) << 0)

#	define UPLL_FB_DIV_MASK				0x01FFFFFF



/* Registers */

#define	CB_COLOR0_BASE					0x28040

#define	CB_COLOR1_BASE					0x28044