-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[LE12] linux update to 6.6.57 #9450
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Part of 6.6.54
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/clk/rockchip/clk-rk3228.c?h=v6.6.57#n412 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -631,30 +631,6 @@ index 38dded2baaf7..9e460b7e14a4 100644 | |
err_clk: | ||
regulator_disable(hdmi->avdd_1v8); | ||
|
||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jonas Karlman <[email protected]> | ||
Date: Wed, 8 Jan 2020 21:07:50 +0000 | ||
Subject: [PATCH] clk: rockchip: set parent rate for DCLK_VOP clock on rk3228 | ||
|
||
Signed-off-by: Jonas Karlman <[email protected]> | ||
--- | ||
drivers/clk/rockchip/clk-rk3228.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c | ||
index a24a35553e13..7343d2d7676b 100644 | ||
--- a/drivers/clk/rockchip/clk-rk3228.c | ||
+++ b/drivers/clk/rockchip/clk-rk3228.c | ||
@@ -409,7 +409,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { | ||
RK2928_CLKSEL_CON(29), 0, 3, DFLAGS), | ||
DIV(0, "sclk_vop_pre", "sclk_vop_src", 0, | ||
RK2928_CLKSEL_CON(27), 8, 8, DFLAGS), | ||
- MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, 0, | ||
+ MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, | ||
RK2928_CLKSEL_CON(27), 1, 1, MFLAGS), | ||
|
||
FACTOR(0, "xin12m", "xin24m", 0, 1, 2), | ||
|
||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jonas Karlman <[email protected]> | ||
Date: Sat, 10 Oct 2020 14:32:21 +0000 | ||
|
@@ -2662,37 +2638,6 @@ index ae4c49e84470..92e621f2714f 100644 | |
|
||
static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = { | ||
|
||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Alex Bee <[email protected]> | ||
Date: Tue, 1 Jun 2021 19:24:37 +0200 | ||
Subject: [PATCH] drm/rockchip: allow 4096px width modes | ||
|
||
There is not reason to limit vop output to 3840px width modes. | ||
Also drop the limitation from dw_hdmi_rockchip_mode_valid, since | ||
the max dimenstions of the actual vop version is validated in | ||
vop_crtc_mode_valid anyways. | ||
|
||
Signed-off-by: Alex Bee <[email protected]> | ||
--- | ||
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | ||
index ef0a078c22f4..49619f794061 100644 | ||
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | ||
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | ||
@@ -424,8 +424,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, | ||
if (info->is_yuv) | ||
is_yuv = true; | ||
|
||
- if (dst_w > 3840) { | ||
- DRM_DEV_ERROR(vop->dev, "Maximum dst width (3840) exceeded\n"); | ||
+ if (dst_w > 4096) { | ||
+ DRM_DEV_ERROR(vop->dev, "Maximum dst width (4096) exceeded\n"); | ||
return; | ||
} | ||
|
||
|
||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jonas Karlman <[email protected]> | ||
Date: Tue, 1 Oct 2019 20:52:42 +0000 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Part of 6.6.49
https://lwn.net/Articles/988749/
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/pinctrl/pinctrl-rockchip.c?h=v6.6.57#n3805