Commit 252776b2 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Fix VPU clock calculation 



The driver calculates the wrong frequency because it ignores
the workpoint config and this cause undesired power/performance
characteristics. Fix this by using the workpoint config in
the freq calculations.

Fixes: 35b13763 ("accel/ivpu: Introduce a new DRM driver for Intel VPU")
Co-developed-by: default avatarAndrzej Kacprowski <andrzej.kacprowski@linux.intel.com>
Signed-off-by: default avatarAndrzej Kacprowski <andrzej.kacprowski@linux.intel.com>
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230323125504.2586442-8-stanislaw.gruszka@linux.intel.com
parent 392b35bf

drivers/accel/ivpu/ivpu_hw_mtl.c

+14 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#define PLL_REF_CLK_FREQ	     (50 * 1000000)

#define PLL_SIMULATION_FREQ	     (10 * 1000000)

#define PLL_RATIO_TO_FREQ(x)	     ((x) * PLL_REF_CLK_FREQ)

#define PLL_DEFAULT_EPP_VALUE	     0x80



#define TIM_SAFE_ENABLE		     0xf1d0dead
@@ -789,6 +788,19 @@ static void ivpu_hw_mtl_wdt_disable(struct ivpu_device *vdev) 
	REGV_WR32(MTL_VPU_CPU_SS_TIM_GEN_CONFIG, val);

}



static u32 ivpu_hw_mtl_pll_to_freq(u32 ratio, u32 config)

{

	u32 pll_clock = PLL_REF_CLK_FREQ * ratio;

	u32 cpu_clock;



	if ((config & 0xff) == PLL_RATIO_4_3)

		cpu_clock = pll_clock * 2 / 4;

	else

		cpu_clock = pll_clock * 2 / 5;



	return cpu_clock;

}



/* Register indirect accesses */

static u32 ivpu_hw_mtl_reg_pll_freq_get(struct ivpu_device *vdev)

{
@@ -800,7 +812,7 @@ static u32 ivpu_hw_mtl_reg_pll_freq_get(struct ivpu_device *vdev) 
	if (!ivpu_is_silicon(vdev))

		return PLL_SIMULATION_FREQ;



	return PLL_RATIO_TO_FREQ(pll_curr_ratio);

	return ivpu_hw_mtl_pll_to_freq(pll_curr_ratio, vdev->hw->config);

}



static u32 ivpu_hw_mtl_reg_telemetry_offset_get(struct ivpu_device *vdev)