mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +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>
72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From cb4fe9fe655a0d6685be00e926842a25bc48b920 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Mon, 5 Feb 2018 18:22:03 +0000
|
|
Subject: [PATCH 189/454] drm/vc4: Remove duplicate primary/cursor fields from
|
|
FKMS driver.
|
|
|
|
The CRTC has those fields and we can just use them.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 24 +++++++-----------------
|
|
1 file changed, 7 insertions(+), 17 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -37,8 +37,6 @@ struct vc4_crtc {
|
|
struct drm_crtc base;
|
|
struct drm_encoder *encoder;
|
|
struct drm_connector *connector;
|
|
- struct drm_plane *primary;
|
|
- struct drm_plane *cursor;
|
|
void __iomem *regs;
|
|
|
|
struct drm_pending_vblank_event *event;
|
|
@@ -356,29 +354,24 @@ static void vc4_crtc_mode_set_nofb(struc
|
|
|
|
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
- struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
-
|
|
/* Always turn the planes off on CRTC disable. In DRM, planes
|
|
* are enabled/disabled through the update/disable hooks
|
|
* above, and the CRTC enable/disable independently controls
|
|
* whether anything scans out at all, but the firmware doesn't
|
|
* give us a CRTC-level control for that.
|
|
*/
|
|
- vc4_cursor_plane_atomic_disable(vc4_crtc->cursor,
|
|
- vc4_crtc->cursor->state);
|
|
- vc4_plane_set_primary_blank(vc4_crtc->primary, true);
|
|
+ vc4_cursor_plane_atomic_disable(crtc->cursor, crtc->cursor->state);
|
|
+ vc4_plane_set_primary_blank(crtc->primary, true);
|
|
}
|
|
|
|
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
- struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
-
|
|
/* Unblank the planes (if they're supposed to be displayed). */
|
|
- if (vc4_crtc->primary->state->fb)
|
|
- vc4_plane_set_primary_blank(vc4_crtc->primary, false);
|
|
- if (vc4_crtc->cursor->state->fb) {
|
|
- vc4_cursor_plane_atomic_update(vc4_crtc->cursor,
|
|
- vc4_crtc->cursor->state);
|
|
+ if (crtc->primary->state->fb)
|
|
+ vc4_plane_set_primary_blank(crtc->primary, false);
|
|
+ if (crtc->cursor->state->fb) {
|
|
+ vc4_cursor_plane_atomic_update(crtc->cursor,
|
|
+ crtc->cursor->state);
|
|
}
|
|
}
|
|
|
|
@@ -689,9 +682,6 @@ static int vc4_fkms_bind(struct device *
|
|
primary_plane->crtc = crtc;
|
|
cursor_plane->crtc = crtc;
|
|
|
|
- vc4_crtc->primary = primary_plane;
|
|
- vc4_crtc->cursor = cursor_plane;
|
|
-
|
|
vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
|
|
if (!vc4_encoder)
|
|
return -ENOMEM;
|