mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +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>
87 lines
2.8 KiB
Diff
87 lines
2.8 KiB
Diff
From 954b81b93de3cc6baa9e2ebdd4e8dc7b63dab71a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Thu, 16 Nov 2017 14:22:30 +0000
|
|
Subject: [PATCH 181/454] drm/vc4: Use .pixel_order instead of custom
|
|
.flip_cbcr
|
|
|
|
The hardware has enums for altering the Cr and Cb order,
|
|
so use this instead of having a flag which swaps the
|
|
order the pointers are presented to the hardware
|
|
(that only worked for 3 plane formats anyway).
|
|
|
|
Explicitly sets .pixel_order in each case, rather than
|
|
relying on then default XYCBCR order being a value 0.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/563872b69c1e5df142cb15ebfca7f20056b8a64c.1510841336.git.dave.stevenson@raspberrypi.org
|
|
(cherry picked from commit 090cb0c690183be849e2bfa0427220f1e435fa30)
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 20 ++++++++------------
|
|
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -86,7 +86,6 @@ static const struct hvs_format {
|
|
u32 hvs; /* HVS_FORMAT_* */
|
|
u32 pixel_order;
|
|
bool has_alpha;
|
|
- bool flip_cbcr;
|
|
} hvs_formats[] = {
|
|
{
|
|
.drm = DRM_FORMAT_XRGB8888, .hvs = HVS_PIXEL_FORMAT_RGBA8888,
|
|
@@ -131,28 +130,32 @@ static const struct hvs_format {
|
|
{
|
|
.drm = DRM_FORMAT_YUV422,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
},
|
|
{
|
|
.drm = DRM_FORMAT_YVU422,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
|
|
- .flip_cbcr = true,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCRCB,
|
|
},
|
|
{
|
|
.drm = DRM_FORMAT_YUV420,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
},
|
|
{
|
|
.drm = DRM_FORMAT_YVU420,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
|
|
- .flip_cbcr = true,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCRCB,
|
|
},
|
|
{
|
|
.drm = DRM_FORMAT_NV12,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
},
|
|
{
|
|
.drm = DRM_FORMAT_NV16,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
},
|
|
};
|
|
|
|
@@ -624,15 +627,8 @@ static int vc4_plane_mode_set(struct drm
|
|
* The pointers may be any byte address.
|
|
*/
|
|
vc4_state->ptr0_offset = vc4_state->dlist_count;
|
|
- if (!format->flip_cbcr) {
|
|
- for (i = 0; i < num_planes; i++)
|
|
- vc4_dlist_write(vc4_state, vc4_state->offsets[i]);
|
|
- } else {
|
|
- WARN_ON_ONCE(num_planes != 3);
|
|
- vc4_dlist_write(vc4_state, vc4_state->offsets[0]);
|
|
- vc4_dlist_write(vc4_state, vc4_state->offsets[2]);
|
|
- vc4_dlist_write(vc4_state, vc4_state->offsets[1]);
|
|
- }
|
|
+ for (i = 0; i < num_planes; i++)
|
|
+ vc4_dlist_write(vc4_state, vc4_state->offsets[i]);
|
|
|
|
/* Pointer Context Word 0/1/2: Written by the HVS */
|
|
for (i = 0; i < num_planes; i++)
|