aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
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>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch103
1 files changed, 103 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch b/target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch
new file mode 100644
index 0000000000..b2fede2cea
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0130-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch
@@ -0,0 +1,103 @@
+From 151e7ee8232ce765ed25ce760ed9a65c3ab71fe3 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Thu, 6 Jul 2017 11:45:48 -0700
+Subject: [PATCH 130/454] drm/vc4: Add support for setting DPMS in firmwarekms.
+
+This ensures that the screen goes blank during DPMS (screensaver),
+including the cursor. Planes don't necessarily get disabled during
+CRTC disable, so we need to be careful to not leave them on or turn
+them back on early.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ drivers/gpu/drm/vc4/vc4_firmware_kms.c | 40 ++++++++++++++++++++++++--
+ 1 file changed, 37 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+@@ -36,6 +36,8 @@ 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;
+@@ -124,8 +126,6 @@ static void vc4_primary_plane_atomic_upd
+ u32 bpp = 32;
+ int ret;
+
+- vc4_plane_set_primary_blank(plane, false);
+-
+ fbinfo->xres = state->crtc_w;
+ fbinfo->yres = state->crtc_h;
+ fbinfo->xres_virtual = state->crtc_w;
+@@ -169,6 +169,12 @@ static void vc4_primary_plane_atomic_upd
+ vc4_plane->fbinfo_bus_addr);
+ WARN_ON_ONCE(fbinfo->pitch != fb->pitches[0]);
+ WARN_ON_ONCE(fbinfo->base != bo->paddr + fb->offsets[0]);
++
++ /* If the CRTC is on (or going to be on) and we're enabled,
++ * then unblank. Otherwise, stay blank until CRTC enable.
++ */
++ if (state->crtc->state->active)
++ vc4_plane_set_primary_blank(plane, false);
+ }
+
+ static void vc4_primary_plane_atomic_disable(struct drm_plane *plane,
+@@ -186,7 +192,12 @@ static void vc4_cursor_plane_atomic_upda
+ struct drm_framebuffer *fb = state->fb;
+ struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
+ int ret;
+- u32 packet_state[] = { true, state->crtc_x, state->crtc_y, 0 };
++ u32 packet_state[] = {
++ state->crtc->state->active,
++ state->crtc_x,
++ state->crtc_y,
++ 0
++ };
+ u32 packet_info[] = { state->crtc_w, state->crtc_h,
+ 0, /* unused */
+ bo->paddr + fb->offsets[0],
+@@ -329,10 +340,30 @@ 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);
+ }
+
+ 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);
++ }
+ }
+
+ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
+@@ -626,6 +657,9 @@ 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;