mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 641b88e2572a66be56c2c1d5aae9acd38d8c6932 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Schake <stschake@gmail.com>
|
|
Date: Fri, 9 Mar 2018 01:53:34 +0100
|
|
Subject: [PATCH 344/454] drm/vc4: Set premultiplied for alpha formats
|
|
|
|
commit 05202c241f1476d8e2b30bb2699f6780962972e8 upstream.
|
|
|
|
Alpha formats in DRM are assumed to be premultiplied, so we should be
|
|
setting the PREMULT bit in the plane configuration for HVS.
|
|
|
|
Changes from v1:
|
|
- Use correct has_alpha
|
|
|
|
Signed-off-by: Stefan Schake <stschake@gmail.com>
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-2-git-send-email-stschake@gmail.com
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 3 ++-
|
|
drivers/gpu/drm/vc4/vc4_regs.h | 1 +
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -618,13 +618,14 @@ static int vc4_plane_mode_set(struct drm
|
|
SCALER_POS1_SCL_HEIGHT));
|
|
}
|
|
|
|
- /* Position Word 2: Source Image Size, Alpha Mode */
|
|
+ /* Position Word 2: Source Image Size, Alpha */
|
|
vc4_state->pos2_offset = vc4_state->dlist_count;
|
|
vc4_dlist_write(vc4_state,
|
|
VC4_SET_FIELD(format->has_alpha ?
|
|
SCALER_POS2_ALPHA_MODE_PIPELINE :
|
|
SCALER_POS2_ALPHA_MODE_FIXED,
|
|
SCALER_POS2_ALPHA_MODE) |
|
|
+ (format->has_alpha ? SCALER_POS2_ALPHA_PREMULT : 0) |
|
|
VC4_SET_FIELD(vc4_state->src_w[0], SCALER_POS2_WIDTH) |
|
|
VC4_SET_FIELD(vc4_state->src_h[0], SCALER_POS2_HEIGHT));
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_regs.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_regs.h
|
|
@@ -877,6 +877,7 @@ enum hvs_pixel_format {
|
|
#define SCALER_POS2_ALPHA_MODE_FIXED 1
|
|
#define SCALER_POS2_ALPHA_MODE_FIXED_NONZERO 2
|
|
#define SCALER_POS2_ALPHA_MODE_FIXED_OVER_0x07 3
|
|
+#define SCALER_POS2_ALPHA_PREMULT BIT(29)
|
|
|
|
#define SCALER_POS2_HEIGHT_MASK VC4_MASK(27, 16)
|
|
#define SCALER_POS2_HEIGHT_SHIFT 16
|