mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +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>
109 lines
3.8 KiB
Diff
109 lines
3.8 KiB
Diff
From 7760958a0fb50b0e20f88e220f55798ec154c41e Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Sat, 8 Jan 2022 13:24:10 +0000
|
|
Subject: [PATCH] drm/vc4: Add alpha_blend_mode property to each plane.
|
|
|
|
Move from only supporting the default of pre-multiplied
|
|
alpha to supporting user specified blend mode using the
|
|
standardised property.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 62 ++++++++++++++++++++++++++-------
|
|
1 file changed, 49 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -664,6 +664,48 @@ static const u32 colorspace_coeffs[2][DR
|
|
}
|
|
};
|
|
|
|
+static u32 vc4_hvs4_get_alpha_blend_mode(struct drm_plane_state *state)
|
|
+{
|
|
+ if (!state->fb->format->has_alpha)
|
|
+ return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
|
|
+ SCALER_POS2_ALPHA_MODE);
|
|
+
|
|
+ switch (state->pixel_blend_mode) {
|
|
+ case DRM_MODE_BLEND_PIXEL_NONE:
|
|
+ return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
|
|
+ SCALER_POS2_ALPHA_MODE);
|
|
+ default:
|
|
+ case DRM_MODE_BLEND_PREMULTI:
|
|
+ return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_PIPELINE,
|
|
+ SCALER_POS2_ALPHA_MODE) |
|
|
+ SCALER_POS2_ALPHA_PREMULT;
|
|
+ case DRM_MODE_BLEND_COVERAGE:
|
|
+ return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_PIPELINE,
|
|
+ SCALER_POS2_ALPHA_MODE);
|
|
+ }
|
|
+}
|
|
+
|
|
+static u32 vc4_hvs5_get_alpha_blend_mode(struct drm_plane_state *state)
|
|
+{
|
|
+ if (!state->fb->format->has_alpha)
|
|
+ return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
|
|
+ SCALER5_CTL2_ALPHA_MODE);
|
|
+
|
|
+ switch (state->pixel_blend_mode) {
|
|
+ case DRM_MODE_BLEND_PIXEL_NONE:
|
|
+ return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
|
|
+ SCALER5_CTL2_ALPHA_MODE);
|
|
+ default:
|
|
+ case DRM_MODE_BLEND_PREMULTI:
|
|
+ return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_PIPELINE,
|
|
+ SCALER5_CTL2_ALPHA_MODE) |
|
|
+ SCALER5_CTL2_ALPHA_PREMULT;
|
|
+ case DRM_MODE_BLEND_COVERAGE:
|
|
+ return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_PIPELINE,
|
|
+ SCALER5_CTL2_ALPHA_MODE);
|
|
+ }
|
|
+}
|
|
+
|
|
/* Writes out a full display list for an active plane to the plane's
|
|
* private dlist state.
|
|
*/
|
|
@@ -946,13 +988,8 @@ static int vc4_plane_mode_set(struct drm
|
|
/* Position Word 2: Source Image Size, Alpha */
|
|
vc4_state->pos2_offset = vc4_state->dlist_count;
|
|
vc4_dlist_write(vc4_state,
|
|
- VC4_SET_FIELD(fb->format->has_alpha ?
|
|
- SCALER_POS2_ALPHA_MODE_PIPELINE :
|
|
- SCALER_POS2_ALPHA_MODE_FIXED,
|
|
- SCALER_POS2_ALPHA_MODE) |
|
|
(mix_plane_alpha ? SCALER_POS2_ALPHA_MIX : 0) |
|
|
- (fb->format->has_alpha ?
|
|
- SCALER_POS2_ALPHA_PREMULT : 0) |
|
|
+ vc4_hvs4_get_alpha_blend_mode(state) |
|
|
VC4_SET_FIELD(vc4_state->src_w[0],
|
|
SCALER_POS2_WIDTH) |
|
|
VC4_SET_FIELD(vc4_state->src_h[0],
|
|
@@ -997,14 +1034,9 @@ static int vc4_plane_mode_set(struct drm
|
|
vc4_dlist_write(vc4_state,
|
|
VC4_SET_FIELD(state->alpha >> 4,
|
|
SCALER5_CTL2_ALPHA) |
|
|
- (fb->format->has_alpha ?
|
|
- SCALER5_CTL2_ALPHA_PREMULT : 0) |
|
|
+ vc4_hvs5_get_alpha_blend_mode(state) |
|
|
(mix_plane_alpha ?
|
|
- SCALER5_CTL2_ALPHA_MIX : 0) |
|
|
- VC4_SET_FIELD(fb->format->has_alpha ?
|
|
- SCALER5_CTL2_ALPHA_MODE_PIPELINE :
|
|
- SCALER5_CTL2_ALPHA_MODE_FIXED,
|
|
- SCALER5_CTL2_ALPHA_MODE)
|
|
+ SCALER5_CTL2_ALPHA_MIX : 0)
|
|
);
|
|
|
|
/* Position Word 1: Scaled Image Dimensions. */
|
|
@@ -1494,6 +1526,10 @@ struct drm_plane *vc4_plane_init(struct
|
|
drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
|
|
|
|
drm_plane_create_alpha_property(plane);
|
|
+ drm_plane_create_blend_mode_property(plane,
|
|
+ BIT(DRM_MODE_BLEND_PIXEL_NONE) |
|
|
+ BIT(DRM_MODE_BLEND_PREMULTI) |
|
|
+ BIT(DRM_MODE_BLEND_COVERAGE));
|
|
drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
|
|
DRM_MODE_ROTATE_0 |
|
|
DRM_MODE_ROTATE_180 |
|