b9c6aeb628
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.78 Removed upstreamed: bcm27xx/patches-6.6/950-0487-drivers-media-imx296-Add-standby-delay-during-probe.patch[1] mediatek/patches-6.6/256-clk-mediatek-mt2701-vdec-fix-conversion-to-mtk_clk_s.patch[2] mediatek/patches-6.6/257-clk-mediatek-mt2701-aud-fix-conversion-to-mtk_clk_si.patch[3] mediatek/patches-6.6/258-clk-mediatek-mt2701-bdp-add-missing-dummy-clk.patch[4] mediatek/patches-6.6/259-clk-mediatek-mt2701-mm-add-missing-dummy-clk.patch[5] mediatek/patches-6.6/260-clk-mediatek-mt2701-img-add-missing-dummy-clk.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=25abffee5ceb6691ecd4f089be2bb28842e2d2fd 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=b6c5237ab7af82c9f1d8d772dbf309bb4aadfdbb 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=20210b5c775d2d96f706591c64bc2ad975c37eaf 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=a1fa3dda6bf0b7ecd95fa8f9125e5486b699a81f 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=fc60e9357f15372698da373ee76de8f52d22aac2 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.78&id=6f4868e6b2887b55531bc8e0a4106ef0150e6326 Build system: x86/64 Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: bcm27xx/bcm2712, 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/18000 Signed-off-by: Robert Marko <robimarko@gmail.com> (cherry picked from commit 57b0304ce93b9e84701de3091c9f272e6b14e6fa) Link: https://github.com/openwrt/openwrt/pull/17987 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 5dc4cef7d7fcda4ea59b9e456a835fa54336af6b Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 21 Oct 2022 14:27:45 +0100
|
|
Subject: [PATCH] drm/vc4: Increase number of overlay planes from 16 to 48
|
|
|
|
The HVS can accept an arbitrary number of planes, provided
|
|
that the overall pixel read load is within limits, and
|
|
the display list can fit into the dlist memory.
|
|
|
|
Now that DRM will support 64 planes per device, increase
|
|
the number of overlay planes from 16 to 48 so that the
|
|
dlist complexity can be increased (eg 4x4 video wall on
|
|
each of 3 displays).
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/drm_connector.c | 2 +-
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_connector.c
|
|
+++ b/drivers/gpu/drm/drm_connector.c
|
|
@@ -363,7 +363,7 @@ static int __drm_connector_init(struct d
|
|
drm_object_attach_property(&connector->base,
|
|
config->non_desktop_property,
|
|
(connector_type != DRM_MODE_CONNECTOR_VIRTUAL &&
|
|
- connector_type != DRM_MODE_CONNECTOR_WRITEBACK) ? 0 : 1;
|
|
+ connector_type != DRM_MODE_CONNECTOR_WRITEBACK) ? 0 : 1);
|
|
drm_object_attach_property(&connector->base,
|
|
config->tile_property,
|
|
0);
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -2517,7 +2517,7 @@ struct drm_plane *vc4_plane_init(struct
|
|
return plane;
|
|
}
|
|
|
|
-#define VC4_NUM_OVERLAY_PLANES 16
|
|
+#define VC4_NUM_OVERLAY_PLANES 48
|
|
|
|
int vc4_plane_create_additional_planes(struct drm_device *drm)
|
|
{
|