-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update patches and enable hdmi console
- Loading branch information
1 parent
cf1ccbf
commit 0f3f615
Showing
8 changed files
with
180 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
openwrt-23.04/patches/target/linux/rockchip/armv8/base-files/etc/inittab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| ::sysinit:/etc/init.d/rcS S boot | ||
| ::shutdown:/etc/init.d/rcS K shutdown | ||
| ::askconsole:/usr/libexec/login.sh | ||
| tty1::askfirst:/usr/libexec/login.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...rget/linux/rockchip/patches-5.15/008-0047-v6.5-drm-rockchip-vop2-fix-suspend-resume.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| From afa965a45e01e541cdbe5c8018226eff117610f0 Mon Sep 17 00:00:00 2001 | ||
| From: Sascha Hauer <[email protected]> | ||
| Date: Thu, 13 Apr 2023 16:43:47 +0200 | ||
| Subject: [PATCH] drm/rockchip: vop2: fix suspend/resume | ||
|
|
||
| During a suspend/resume cycle the VO power domain will be disabled and | ||
| the VOP2 registers will reset to their default values. After that the | ||
| cached register values will be out of sync and the read/modify/write | ||
| operations we do on the window registers will result in bogus values | ||
| written. Fix this by re-initializing the register cache each time we | ||
| enable the VOP2. With this the VOP2 will show a picture after a | ||
| suspend/resume cycle whereas without this the screen stays dark. | ||
|
|
||
| Fixes: 604be85547ce4 ("drm/rockchip: Add VOP2 driver") | ||
| Cc: [email protected] | ||
| Signed-off-by: Sascha Hauer <[email protected]> | ||
| Tested-by: Chris Morgan <[email protected]> | ||
| Signed-off-by: Heiko Stuebner <[email protected]> | ||
| Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] | ||
| --- | ||
| drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 8 ++++++++ | ||
| 1 file changed, 8 insertions(+) | ||
|
|
||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| @@ -214,6 +214,8 @@ struct vop2 { | ||
| struct vop2_win win[]; | ||
| }; | ||
|
|
||
| +static const struct regmap_config vop2_regmap_config; | ||
| + | ||
| static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc) | ||
| { | ||
| return container_of(crtc, struct vop2_video_port, crtc); | ||
| @@ -838,6 +840,12 @@ static void vop2_enable(struct vop2 *vop | ||
| return; | ||
| } | ||
|
|
||
| + ret = regmap_reinit_cache(vop2->map, &vop2_regmap_config); | ||
| + if (ret) { | ||
| + drm_err(vop2->drm, "failed to reinit cache: %d\n", ret); | ||
| + return; | ||
| + } | ||
| + | ||
| if (vop2->data->soc_id == 3566) | ||
| vop2_writel(vop2, RK3568_OTP_WIN_EN, 1); | ||
|
|
53 changes: 53 additions & 0 deletions
53
...atches-5.15/008-0048-v6.5-drm-rockchip-vop2-Use-regcache_sync-to-fix-suspend-resume.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| From b63a553e8f5aa6574eeb535a551817a93c426d8c Mon Sep 17 00:00:00 2001 | ||
| From: Sascha Hauer <[email protected]> | ||
| Date: Mon, 17 Apr 2023 14:37:47 +0200 | ||
| Subject: [PATCH] drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume | ||
|
|
||
| afa965a45e01 ("drm/rockchip: vop2: fix suspend/resume") uses | ||
| regmap_reinit_cache() to fix the suspend/resume issue with the VOP2 | ||
| driver. During discussion it came up that we should rather use | ||
| regcache_sync() instead. As the original patch is already applied | ||
| fix this up in this follow-up patch. | ||
|
|
||
| Fixes: afa965a45e01 ("drm/rockchip: vop2: fix suspend/resume") | ||
| Cc: [email protected] | ||
| Signed-off-by: Sascha Hauer <[email protected]> | ||
| Signed-off-by: Heiko Stuebner <[email protected]> | ||
| Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] | ||
| --- | ||
| drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 10 +++------- | ||
| 1 file changed, 3 insertions(+), 7 deletions(-) | ||
|
|
||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | ||
| @@ -214,8 +214,6 @@ struct vop2 { | ||
| struct vop2_win win[]; | ||
| }; | ||
|
|
||
| -static const struct regmap_config vop2_regmap_config; | ||
| - | ||
| static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc) | ||
| { | ||
| return container_of(crtc, struct vop2_video_port, crtc); | ||
| @@ -840,11 +838,7 @@ static void vop2_enable(struct vop2 *vop | ||
| return; | ||
| } | ||
|
|
||
| - ret = regmap_reinit_cache(vop2->map, &vop2_regmap_config); | ||
| - if (ret) { | ||
| - drm_err(vop2->drm, "failed to reinit cache: %d\n", ret); | ||
| - return; | ||
| - } | ||
| + regcache_sync(vop2->map); | ||
|
|
||
| if (vop2->data->soc_id == 3566) | ||
| vop2_writel(vop2, RK3568_OTP_WIN_EN, 1); | ||
| @@ -874,6 +868,8 @@ static void vop2_disable(struct vop2 *vo | ||
|
|
||
| pm_runtime_put_sync(vop2->dev); | ||
|
|
||
| + regcache_mark_dirty(vop2->map); | ||
| + | ||
| clk_disable_unprepare(vop2->aclk); | ||
| clk_disable_unprepare(vop2->hclk); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters