mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From f6d8271436e2589629ed6f3a8a85c3bde53353d6 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 1 Apr 2022 17:10:37 +0100
|
|
Subject: [PATCH 0026/1085] drm/atomic: If margins are updated, update all
|
|
planes.
|
|
|
|
Margins may be implemented by scaling the planes, but as there
|
|
is no way of intercepting the set_property for a standard property,
|
|
and all planes are checked in drm_atomic_check_only before the
|
|
connectors, there's now way to add the planes into the state
|
|
from the driver.
|
|
|
|
If the margin properties change, add all corresponding planes to
|
|
the state.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/drm_atomic_uapi.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/drm_atomic_uapi.c
|
|
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
|
|
@@ -701,6 +701,7 @@ static int drm_atomic_connector_set_prop
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
+ bool margins_updated = false;
|
|
bool replaced = false;
|
|
int ret;
|
|
|
|
@@ -729,12 +730,16 @@ static int drm_atomic_connector_set_prop
|
|
state->tv.subconnector = val;
|
|
} else if (property == config->tv_left_margin_property) {
|
|
state->tv.margins.left = val;
|
|
+ margins_updated = true;
|
|
} else if (property == config->tv_right_margin_property) {
|
|
state->tv.margins.right = val;
|
|
+ margins_updated = true;
|
|
} else if (property == config->tv_top_margin_property) {
|
|
state->tv.margins.top = val;
|
|
+ margins_updated = true;
|
|
} else if (property == config->tv_bottom_margin_property) {
|
|
state->tv.margins.bottom = val;
|
|
+ margins_updated = true;
|
|
} else if (property == config->legacy_tv_mode_property) {
|
|
state->tv.legacy_mode = val;
|
|
} else if (property == config->tv_mode_property) {
|
|
@@ -817,6 +822,12 @@ static int drm_atomic_connector_set_prop
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ if (margins_updated && state->crtc) {
|
|
+ ret = drm_atomic_add_affected_planes(state->state, state->crtc);
|
|
+
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|