mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
21549dbf7b
Update patch set for new release and add required kernel option
CONFIG_ZRAM_TRACK_ENTRY_ACTIME to generic config
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.66
Manually rebased:
bcm27xx/patches-6.6/950-0092-MMC-added-alternative-MMC-driver.patch
bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch
Removed upstreamed:
bcm27xx/patches-6.6/950-0029-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.66&id=e0388a95736abd1f5f5a94221dd1ac24eacbd4d7
Build system: x86/64
Build-tested: bcm27xx/bcm2712, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64
Run-tested: bcm27xx/bcm2712, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/17271
(cherry picked from commit 28f534d953)
Link: https://github.com/openwrt/openwrt/pull/17302
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
168 lines
4.8 KiB
Diff
168 lines
4.8 KiB
Diff
From a8124c63760bac96853d2aee2c95a2f29c870f69 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 17 Feb 2023 15:14:55 +0100
|
|
Subject: [PATCH 0591/1085] drm/vc4: hvs: Create cob_init function
|
|
|
|
Just like the HVS itself, the COB parameters will be fairly different in
|
|
the BCM2712.
|
|
|
|
Let's move the COB parameters computation and its initialisation to a
|
|
separate function that will be easier to extend in the future.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 128 ++++++++++++++++++++--------------
|
|
1 file changed, 74 insertions(+), 54 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -1385,6 +1385,77 @@ static int vc4_hvs_hw_init(struct vc4_hv
|
|
return 0;
|
|
}
|
|
|
|
+static int vc4_hvs_cob_init(struct vc4_hvs *hvs)
|
|
+{
|
|
+ struct vc4_dev *vc4 = hvs->vc4;
|
|
+ u32 reg, top;
|
|
+
|
|
+ /*
|
|
+ * Recompute Composite Output Buffer (COB) allocations for the
|
|
+ * displays
|
|
+ */
|
|
+ switch (vc4->gen) {
|
|
+ case VC4_GEN_4:
|
|
+ /* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
|
|
+ * The bottom 2048 pixels are full 32bpp RGBA (intended for the
|
|
+ * TXP composing RGBA to memory), whilst the remainder are only
|
|
+ * 24bpp RGB.
|
|
+ *
|
|
+ * Assign 3 lines to channels 1 & 2, and just over 4 lines to
|
|
+ * channel 0.
|
|
+ */
|
|
+ #define VC4_COB_SIZE 20736
|
|
+ #define VC4_COB_LINE_WIDTH 2048
|
|
+ #define VC4_COB_NUM_LINES 3
|
|
+ reg = 0;
|
|
+ top = VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
|
|
+ reg |= (top - 1) << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE2, reg);
|
|
+ reg = top;
|
|
+ top += VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
|
|
+ reg |= (top - 1) << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE1, reg);
|
|
+ reg = top;
|
|
+ top = VC4_COB_SIZE;
|
|
+ reg |= (top - 1) << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE0, reg);
|
|
+ break;
|
|
+
|
|
+ case VC4_GEN_5:
|
|
+ /* The COB is 44416 pixels, or 10.8 lines at 4096 wide.
|
|
+ * The bottom 4096 pixels are full RGBA (intended for the TXP
|
|
+ * composing RGBA to memory), whilst the remainder are only
|
|
+ * RGB. Addressing is always pixel wide.
|
|
+ *
|
|
+ * Assign 3 lines of 4096 to channels 1 & 2, and just over 4
|
|
+ * lines. to channel 0.
|
|
+ */
|
|
+ #define VC5_COB_SIZE 44416
|
|
+ #define VC5_COB_LINE_WIDTH 4096
|
|
+ #define VC5_COB_NUM_LINES 3
|
|
+ reg = 0;
|
|
+ top = VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
|
|
+ reg |= top << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE2, reg);
|
|
+ top += 16;
|
|
+ reg = top;
|
|
+ top += VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
|
|
+ reg |= top << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE1, reg);
|
|
+ top += 16;
|
|
+ reg = top;
|
|
+ top = VC5_COB_SIZE;
|
|
+ reg |= top << 16;
|
|
+ HVS_WRITE(SCALER_DISPBASE0, reg);
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
@@ -1392,7 +1463,6 @@ static int vc4_hvs_bind(struct device *d
|
|
struct vc4_dev *vc4 = to_vc4_dev(drm);
|
|
struct vc4_hvs *hvs = NULL;
|
|
int ret;
|
|
- u32 reg, top;
|
|
|
|
hvs = __vc4_hvs_alloc(vc4, NULL);
|
|
if (IS_ERR(hvs))
|
|
@@ -1462,59 +1532,9 @@ static int vc4_hvs_bind(struct device *d
|
|
if (ret)
|
|
return ret;
|
|
|
|
- /* Recompute Composite Output Buffer (COB) allocations for the displays
|
|
- */
|
|
- if (vc4->gen == VC4_GEN_4) {
|
|
- /* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
|
|
- * The bottom 2048 pixels are full 32bpp RGBA (intended for the
|
|
- * TXP composing RGBA to memory), whilst the remainder are only
|
|
- * 24bpp RGB.
|
|
- *
|
|
- * Assign 3 lines to channels 1 & 2, and just over 4 lines to
|
|
- * channel 0.
|
|
- */
|
|
- #define VC4_COB_SIZE 20736
|
|
- #define VC4_COB_LINE_WIDTH 2048
|
|
- #define VC4_COB_NUM_LINES 3
|
|
- reg = 0;
|
|
- top = VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
|
|
- reg |= (top - 1) << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE2, reg);
|
|
- reg = top;
|
|
- top += VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
|
|
- reg |= (top - 1) << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE1, reg);
|
|
- reg = top;
|
|
- top = VC4_COB_SIZE;
|
|
- reg |= (top - 1) << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE0, reg);
|
|
- } else {
|
|
- /* The COB is 44416 pixels, or 10.8 lines at 4096 wide.
|
|
- * The bottom 4096 pixels are full RGBA (intended for the TXP
|
|
- * composing RGBA to memory), whilst the remainder are only
|
|
- * RGB. Addressing is always pixel wide.
|
|
- *
|
|
- * Assign 3 lines of 4096 to channels 1 & 2, and just over 4
|
|
- * lines. to channel 0.
|
|
- */
|
|
- #define VC5_COB_SIZE 44416
|
|
- #define VC5_COB_LINE_WIDTH 4096
|
|
- #define VC5_COB_NUM_LINES 3
|
|
- reg = 0;
|
|
- top = VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
|
|
- reg |= top << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE2, reg);
|
|
- top += 16;
|
|
- reg = top;
|
|
- top += VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
|
|
- reg |= top << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE1, reg);
|
|
- top += 16;
|
|
- reg = top;
|
|
- top = VC5_COB_SIZE;
|
|
- reg |= top << 16;
|
|
- HVS_WRITE(SCALER_DISPBASE0, reg);
|
|
- }
|
|
+ ret = vc4_hvs_cob_init(hvs);
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
|
|
vc4_hvs_irq_handler, 0, "vc4 hvs", drm);
|