Skip to content

Commit 3844ef9

Browse files
committed
Main: adjust broken patches on Meson and Rockchip64
1 parent fc8fef0 commit 3844ef9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

patch/kernel/archive/meson-6.12/0052-drm-meson-Describe-the-HDMI-PHY-frequency-limits-of-.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ index 111111111111..222222222222 100644
4343
+ */
4444
{
4545
.limits = {
46-
.max_hdmi_phy_freq = 1650000,
46+
.max_hdmi_phy_freq = 1650000000,
4747
},
4848
.attrs = (const struct soc_device_attribute []) {
4949
{ .soc_id = "GXL (S805*)", },

patch/kernel/archive/rockchip64-6.12/rk3588-0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/roc
2121
index 111111111111..222222222222 100644
2222
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
2323
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
24-
@@ -193,6 +193,10 @@
24+
@@ -193,7 +193,11 @@
2525
#define LN3_TX_SER_RATE_SEL_HBR3 BIT(2)
2626

27+
#define HDMI14_MAX_RATE 340000000
2728
#define HDMI20_MAX_RATE 600000000
2829
+#define DATA_RATE_MASK 0xFFFFFFF
2930
+#define COLOR_DEPTH_MASK BIT(31)
@@ -346,20 +347,17 @@ index 111111111111..222222222222 100644
346347
static bool rk_hdptx_phy_clk_pll_calc(unsigned int data_rate,
347348
struct ropll_config *cfg)
348349
{
349-
@@ -765,9 +1034,13 @@ static bool rk_hdptx_phy_clk_pll_calc(unsigned int data_rate,
350+
@@ -765,7 +1034,11 @@ static bool rk_hdptx_phy_clk_pll_calc(unsigned int data_rate,
350351
static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
351352
unsigned int rate)
352353
{
353-
+ int i, bus_width = phy_get_bus_width(hdptx->phy);
354+
+ int bus_width = phy_get_bus_width(hdptx->phy);
354355
+ u8 color_depth = (bus_width & COLOR_DEPTH_MASK) ? 1 : 0;
355356
const struct ropll_config *cfg = NULL;
356357
struct ropll_config rc = {0};
357-
- int i;
358-
+
359358
+ if (color_depth)
360359
+ rate = rate * 10 / 8;
361-
362-
hdptx->rate = rate * 100;
360+
int ret, i;
363361

364362
@@ -825,6 +1098,9 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
365363
regmap_update_bits(hdptx->regmap, CMN_REG(0086), PLL_PCG_POSTDIV_SEL_MASK,

0 commit comments

Comments
 (0)