mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
ca5c695a45
Deleted following upstreamed patches: bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch Manually rebased following patches: bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
97 lines
3.5 KiB
Diff
97 lines
3.5 KiB
Diff
From 0496e855a6e1acd60d4ae2e52ee906a4cffae014 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 21 Jun 2021 16:07:22 +0200
|
|
Subject: [PATCH] drm/vc4: crtc: Rework the encoder retrieval code
|
|
(again)
|
|
|
|
It turns out the encoder retrieval code, in addition to being
|
|
unnecessarily complicated, has a bug when only the planes and crtcs are
|
|
affected by a given atomic commit.
|
|
|
|
Indeed, in such a case, either drm_atomic_get_old_connector_state or
|
|
drm_atomic_get_new_connector_state will return NULL and thus our encoder
|
|
retrieval code will not match on anything.
|
|
|
|
We can however simplify the code by using drm_for_each_encoder_mask, the
|
|
drm_crtc_state storing the encoders a given CRTC is connected to
|
|
directly and without relying on any other state.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 30 +++++++++---------------------
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 4 +---
|
|
2 files changed, 10 insertions(+), 24 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -282,26 +282,14 @@ static u32 vc4_crtc_get_fifo_full_level_
|
|
* same CRTC.
|
|
*/
|
|
struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
|
|
- struct drm_atomic_state *state,
|
|
- struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
|
|
- struct drm_connector *connector))
|
|
+ struct drm_crtc_state *state)
|
|
{
|
|
- struct drm_connector *connector;
|
|
- struct drm_connector_list_iter conn_iter;
|
|
+ struct drm_encoder *encoder;
|
|
|
|
- drm_connector_list_iter_begin(crtc->dev, &conn_iter);
|
|
- drm_for_each_connector_iter(connector, &conn_iter) {
|
|
- struct drm_connector_state *conn_state = get_state(state, connector);
|
|
-
|
|
- if (!conn_state)
|
|
- continue;
|
|
-
|
|
- if (conn_state->crtc == crtc) {
|
|
- drm_connector_list_iter_end(&conn_iter);
|
|
- return connector->encoder;
|
|
- }
|
|
- }
|
|
- drm_connector_list_iter_end(&conn_iter);
|
|
+ WARN_ON(hweight32(state->encoder_mask) > 1);
|
|
+
|
|
+ drm_for_each_encoder_mask(encoder, crtc->dev, state->encoder_mask)
|
|
+ return encoder;
|
|
|
|
return NULL;
|
|
}
|
|
@@ -554,8 +542,7 @@ static void vc4_crtc_atomic_disable(stru
|
|
struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
|
|
crtc);
|
|
struct vc4_crtc_state *old_vc4_state = to_vc4_crtc_state(old_state);
|
|
- struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
|
|
- drm_atomic_get_old_connector_state);
|
|
+ struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, old_state);
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
require_hvs_enabled(dev);
|
|
@@ -582,10 +569,11 @@ static void vc4_crtc_atomic_disable(stru
|
|
static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
|
|
struct drm_atomic_state *state)
|
|
{
|
|
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state,
|
|
+ crtc);
|
|
struct drm_device *dev = crtc->dev;
|
|
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
- struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
|
|
- drm_atomic_get_new_connector_state);
|
|
+ struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, new_state);
|
|
struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
|
|
|
|
require_hvs_enabled(dev);
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -545,9 +545,7 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
|
|
}
|
|
|
|
struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
|
|
- struct drm_atomic_state *state,
|
|
- struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
|
|
- struct drm_connector *connector));
|
|
+ struct drm_crtc_state *state);
|
|
|
|
struct vc4_crtc_state {
|
|
struct drm_crtc_state base;
|