Skip to contentSkip to conversation

clk: qcom: clk-rcg2: Update logic to calculate D value for RCG

PATCH Applied Taniya Das 2 participants 3 messages Feb 27, 2022 – Mar 9, 2022

Subsystems (3)
lore
Share & tools
lore

Taniya Das

author
#0 lore raw

PATCH v3 1/2 clk: qcom: clk-rcg2: Update logic to calculate D value for RCG

The display pixel clock has a requirement on certain newer platforms to support M/N as (2/3) and the final D value calculated results in underflow errors.
As the current implementation does not check for D value is within the accepted range for a given M & N value. Update the logic to calculate the final D value based on the range.

Fixes 99cbd064b059f ("clk: qcom: Support display RCG clocks")

---
[v3]
* Use clamp_t() instead of clamp().
* Update the commit message for the display use case.

 drivers/clk/qcom/clk-rcg2.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/clk/qcom/clk-rcg2.c +11 -2
index e1b1b426fae4..b831975a9606 100644
@@ -264,7 +264,7 @@ static int clk_rcg2_determine_floor_rate(struct clk_hw *hw,
 
 static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
 {
-	u32 cfg, mask;
+	u32 cfg, mask, d_val, not2d_val, n_minus_m;
 	struct clk_hw *hw = &rcg->clkr.hw;
 	int ret, index = qcom_find_src_index(hw, rcg->parent_map, f->src);
 
@@ -283,8 +283,17 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
 		if (ret)
 			return ret;
 
+		/* Calculate 2d value */
+		d_val = f->n;
+
+		n_minus_m = f->n - f->m;
+		n_minus_m *= 2;
+
+		d_val = clamp_t(u32, d_val, f->m, n_minus_m);
+		not2d_val = ~d_val & mask;
+
 		ret = regmap_update_bits(rcg->clkr.regmap,
-				RCG_D_OFFSET(rcg), mask, ~f->n);
+				RCG_D_OFFSET(rcg), mask, not2d_val);
 		if (ret)
 			return ret;
 	}

--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.

author
#1 lore raw

PATCH v3 2/2 clk: qcom: clk-rcg2: Update the frac table for pixel clock

Support the new numerator and denominator for pixel clock on SM8350 and support rgb101010, RGB888 use cases on SM8450.

Fixes 99cbd064b059f ("clk: qcom: Support display RCG clocks")
---
 drivers/clk/qcom/clk-rcg2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/clk-rcg2.c +1 -0
index b831975a9606..f675fd969c4d 100644
@@ -729,6 +729,7 @@ static const struct frac_entry frac_table_pixel[] = {
 	{ 2, 9 },
 	{ 4, 9 },
 	{ 1, 1 },
+	{ 2, 3 },
 	{ }
 };
 

--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.

#2 lore raw
In reply to Taniya Das
This series was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:

Hello:

This series was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:

Quoted 8 lines · On Sun, 27 Feb 2022 23:25:35 +0530 you wrote:

The display pixel clock has a requirement on certain newer platforms to support M/N as (2/3) and the final D value calculated results in underflow errors.
As the current implementation does not check for D value is within the accepted range for a given M & N value. Update the logic to calculate the final D value based on the range.

[...]

Here is the summary with links:
- [v3,1/2] clk: qcom: clk-rcg2: Update logic to calculate D value for RCG

    https://git.kernel.org/qcom/c/3857b7b03eb5
  - [v3,2/2] clk: qcom: clk-rcg2: Update the frac table for pixel clock
    https://git.kernel.org/qcom/c/170961200c69

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html