130 lines
7.6 KiB
Diff
130 lines
7.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: paolo <[email protected]>
|
|
Date: Sat, 19 Sep 2020 15:20:16 +0000
|
|
Subject: [ARCHEOLOGY] Many changes for rk322x target:
|
|
|
|
> X-Git-Archeology: > recovered message: > - Chanaged default x.org configuration to disable glamor
|
|
> X-Git-Archeology: > recovered message: > - Reintroduce patch to use DRM cursor plane as overlay in rk322x-current and -dev
|
|
> X-Git-Archeology: > recovered message: > - Updated wifi patches for kernel 5.8.10
|
|
> X-Git-Archeology: > recovered message: > - Bumped rk322x to u-boot v2020.07, removed reserved zones from device trees
|
|
> X-Git-Archeology: > recovered message: > - Updated OPTEE to v3.10, using ddrbin v1.10
|
|
> X-Git-Archeology: > recovered message: > - Bumped rk322x-current to kernel 5.8.y
|
|
> X-Git-Archeology: > recovered message: > - Imported new patches from knaerzche's LibreELEC fork for rk322x-dev (kernel 5.8.y)
|
|
> X-Git-Archeology: > recovered message: > - Adjusted existing patches to match changes, updated rk322x-dev kernel config file
|
|
> X-Git-Archeology: > recovered message: > - Add default modprobe conf file for esp8089 to force the crystal frequency to 40Mhz for rk322x targets
|
|
> X-Git-Archeology: > recovered message: > - Removed ssv6051 firmware packages to move to armbian-firmware repository
|
|
> X-Git-Archeology: > recovered message: > - Switching ssv6051-wifi.cfg to /lib/firmware for rk322x-legacy
|
|
> X-Git-Archeology: > recovered message: > - Removed P2P interface for esp8089 driver for rk322x-legacy
|
|
> X-Git-Archeology: > recovered message: > - Optimized ssv6051 performance: kernel module gains -Os flag, disabled p2p interface, enabled HW crypto for CCMP cipher
|
|
> X-Git-Archeology: > recovered message: > - Enabled remote control interface, IR GPIO kernel module and HDMI CEC modules
|
|
> X-Git-Archeology: - Revision bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076: https://github.com/armbian/build/commit/bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076
|
|
> X-Git-Archeology: Date: Sat, 19 Sep 2020 15:20:16 +0000
|
|
> X-Git-Archeology: From: paolo <[email protected]>
|
|
> X-Git-Archeology: Subject: Many changes for rk322x target:
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
|
|
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
|
|
> X-Git-Archeology: From: Igor Pecovnik <[email protected]>
|
|
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969
|
|
> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399
|
|
> X-Git-Archeology: Date: Mon, 25 Mar 2024 19:38:38 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.8
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba
|
|
> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:51 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7
|
|
> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:18:14 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.10
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051
|
|
> X-Git-Archeology: Date: Wed, 18 Sep 2024 14:03:19 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.11
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251
|
|
> X-Git-Archeology: Date: Sat, 30 Nov 2024 13:07:31 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.12
|
|
> X-Git-Archeology:
|
|
---
|
|
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 44 +++++++++-
|
|
1 file changed, 41 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
|
@@ -735,6 +735,44 @@ static const struct vop_common rk3288_common = {
|
|
.dsp_background = VOP_REG(RK3288_DSP_BG, 0xffffffff, 0),
|
|
};
|
|
|
|
+static const struct vop_win_phy rk3228_win0_data = {
|
|
+ .scl = &rk3288_win_full_scl,
|
|
+ .data_formats = formats_win_full,
|
|
+ .nformats = ARRAY_SIZE(formats_win_full),
|
|
+ .enable = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 0),
|
|
+ .format = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 1),
|
|
+ .rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
|
|
+ .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
|
|
+ .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0),
|
|
+ .dsp_st = VOP_REG(RK3288_WIN0_DSP_ST, 0x1fff1fff, 0),
|
|
+ .yrgb_mst = VOP_REG(RK3288_WIN0_YRGB_MST, 0xffffffff, 0),
|
|
+ .uv_mst = VOP_REG(RK3288_WIN0_CBR_MST, 0xffffffff, 0),
|
|
+ .yrgb_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 0),
|
|
+ .uv_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 16),
|
|
+ .src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xff, 0),
|
|
+ .dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xff, 0),
|
|
+ .channel = VOP_REG(RK3288_WIN0_CTRL2, 0xff, 0),
|
|
+};
|
|
+
|
|
+static const struct vop_win_phy rk3228_win1_data = {
|
|
+ .scl = &rk3288_win_full_scl,
|
|
+ .data_formats = formats_win_lite,
|
|
+ .nformats = ARRAY_SIZE(formats_win_lite),
|
|
+ .enable = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 0),
|
|
+ .format = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 1),
|
|
+ .rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
|
|
+ .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
|
|
+ .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0),
|
|
+ .dsp_st = VOP_REG(RK3288_WIN0_DSP_ST, 0x1fff1fff, 0),
|
|
+ .yrgb_mst = VOP_REG(RK3288_WIN0_YRGB_MST, 0xffffffff, 0),
|
|
+ .uv_mst = VOP_REG(RK3288_WIN0_CBR_MST, 0xffffffff, 0),
|
|
+ .yrgb_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 0),
|
|
+ .uv_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 16),
|
|
+ .src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xff, 0),
|
|
+ .dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xff, 0),
|
|
+ .channel = VOP_REG(RK3288_WIN0_CTRL2, 0xff, 0),
|
|
+};
|
|
+
|
|
/*
|
|
* Note: rk3288 has a dedicated 'cursor' window, however, that window requires
|
|
* special support to get alpha blending working. For now, just use overlay
|
|
@@ -1112,10 +1150,10 @@ static const struct vop_data rk3399_vop_lit = {
|
|
};
|
|
|
|
static const struct vop_win_data rk3228_vop_win_data[] = {
|
|
- { .base = 0x00, .phy = &rk3288_win01_data,
|
|
+ { .base = 0x00, .phy = &rk3228_win0_data,
|
|
.type = DRM_PLANE_TYPE_PRIMARY },
|
|
- { .base = 0x40, .phy = &rk3288_win01_data,
|
|
- .type = DRM_PLANE_TYPE_CURSOR },
|
|
+ { .base = 0x40, .phy = &rk3228_win1_data,
|
|
+ .type = DRM_PLANE_TYPE_OVERLAY },
|
|
};
|
|
|
|
static const struct vop_data rk3228_vop = {
|
|
--
|
|
Armbian
|
|
|