mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
2909cce1b2
Removed upstreamed: bcm27xx/patches-6.1/950-1235-drm-vc4-don-t-check-if-plane-state-fb-state-fb.patch [1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.86&id=48bfb4b03c5ff6e1fa1dc73fb915e150b0968c40 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
145 lines
4.8 KiB
Diff
145 lines
4.8 KiB
Diff
From 7354aa4ed8b97b3bd7706e6440a087491a47fb39 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 25 Jan 2022 17:28:18 +0000
|
|
Subject: [PATCH] drm/vc4: Support zpos on all planes
|
|
|
|
Adds the zpos property to all planes, and creates the dlist
|
|
by placing the fragments in the correct order based on zpos.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 43 +++++++++++++++++++++------------
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 3 +--
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 22 ++++++++++++++---
|
|
3 files changed, 48 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -769,6 +769,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
bool enable_bg_fill = false;
|
|
u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
|
|
u32 __iomem *dlist_next = dlist_start;
|
|
+ unsigned int zpos = 0;
|
|
+ bool found = false;
|
|
int idx;
|
|
|
|
if (!drm_dev_enter(dev, &idx)) {
|
|
@@ -782,23 +784,34 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
}
|
|
|
|
/* Copy all the active planes' dlist contents to the hardware dlist. */
|
|
- drm_atomic_crtc_for_each_plane(plane, crtc) {
|
|
- /* Is this the first active plane? */
|
|
- if (dlist_next == dlist_start) {
|
|
- /* We need to enable background fill when a plane
|
|
- * could be alpha blending from the background, i.e.
|
|
- * where no other plane is underneath. It suffices to
|
|
- * consider the first active plane here since we set
|
|
- * needs_bg_fill such that either the first plane
|
|
- * already needs it or all planes on top blend from
|
|
- * the first or a lower plane.
|
|
- */
|
|
- vc4_plane_state = to_vc4_plane_state(plane->state);
|
|
- enable_bg_fill = vc4_plane_state->needs_bg_fill;
|
|
+ do {
|
|
+ found = false;
|
|
+
|
|
+ drm_atomic_crtc_for_each_plane(plane, crtc) {
|
|
+ if (plane->state->normalized_zpos != zpos)
|
|
+ continue;
|
|
+
|
|
+ /* Is this the first active plane? */
|
|
+ if (dlist_next == dlist_start) {
|
|
+ /* We need to enable background fill when a plane
|
|
+ * could be alpha blending from the background, i.e.
|
|
+ * where no other plane is underneath. It suffices to
|
|
+ * consider the first active plane here since we set
|
|
+ * needs_bg_fill such that either the first plane
|
|
+ * already needs it or all planes on top blend from
|
|
+ * the first or a lower plane.
|
|
+ */
|
|
+ vc4_plane_state = to_vc4_plane_state(plane->state);
|
|
+ enable_bg_fill = vc4_plane_state->needs_bg_fill;
|
|
+ }
|
|
+
|
|
+ dlist_next += vc4_plane_write_dlist(plane, dlist_next);
|
|
+
|
|
+ found = true;
|
|
}
|
|
|
|
- dlist_next += vc4_plane_write_dlist(plane, dlist_next);
|
|
- }
|
|
+ zpos++;
|
|
+ } while (found);
|
|
|
|
writel(SCALER_CTL0_END, dlist_next);
|
|
dlist_next++;
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -1066,8 +1066,7 @@ int vc4_kms_load(struct drm_device *dev)
|
|
dev->mode_config.helper_private = &vc4_mode_config_helpers;
|
|
dev->mode_config.preferred_depth = 24;
|
|
dev->mode_config.async_page_flip = true;
|
|
- if (vc4->firmware_kms)
|
|
- dev->mode_config.normalize_zpos = true;
|
|
+ dev->mode_config.normalize_zpos = true;
|
|
|
|
ret = vc4_ctm_obj_init(vc4);
|
|
if (ret)
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -1597,9 +1597,14 @@ struct drm_plane *vc4_plane_init(struct
|
|
DRM_COLOR_YCBCR_BT709,
|
|
DRM_COLOR_YCBCR_LIMITED_RANGE);
|
|
|
|
+ if (type == DRM_PLANE_TYPE_PRIMARY)
|
|
+ drm_plane_create_zpos_immutable_property(plane, 0);
|
|
+
|
|
return plane;
|
|
}
|
|
|
|
+#define VC4_NUM_OVERLAY_PLANES 16
|
|
+
|
|
int vc4_plane_create_additional_planes(struct drm_device *drm)
|
|
{
|
|
struct drm_plane *cursor_plane;
|
|
@@ -1615,24 +1620,35 @@ int vc4_plane_create_additional_planes(s
|
|
* modest number of planes to expose, that should hopefully
|
|
* still cover any sane usecase.
|
|
*/
|
|
- for (i = 0; i < 16; i++) {
|
|
+ for (i = 0; i < VC4_NUM_OVERLAY_PLANES; i++) {
|
|
struct drm_plane *plane =
|
|
vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY,
|
|
GENMASK(drm->mode_config.num_crtc - 1, 0));
|
|
|
|
if (IS_ERR(plane))
|
|
continue;
|
|
+
|
|
+ /* Create zpos property. Max of all the overlays + 1 primary +
|
|
+ * 1 cursor plane on a crtc.
|
|
+ */
|
|
+ drm_plane_create_zpos_property(plane, i + 1, 1,
|
|
+ VC4_NUM_OVERLAY_PLANES + 1);
|
|
}
|
|
|
|
drm_for_each_crtc(crtc, drm) {
|
|
/* Set up the legacy cursor after overlay initialization,
|
|
- * since we overlay planes on the CRTC in the order they were
|
|
- * initialized.
|
|
+ * since the zpos fallback is that planes are rendered by plane
|
|
+ * ID order, and that then puts the cursor on top.
|
|
*/
|
|
cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR,
|
|
drm_crtc_mask(crtc));
|
|
if (!IS_ERR(cursor_plane)) {
|
|
crtc->cursor = cursor_plane;
|
|
+
|
|
+ drm_plane_create_zpos_property(cursor_plane,
|
|
+ VC4_NUM_OVERLAY_PLANES + 1,
|
|
+ 1,
|
|
+ VC4_NUM_OVERLAY_PLANES + 1);
|
|
}
|
|
}
|
|
|