mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 501dabdd480e2da1b3b1395b5ebf9d5306fec689 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Wed, 10 Apr 2019 17:42:37 +0100
|
|
Subject: [PATCH] drm: vc4: Iterate over all planes in
|
|
vc4_crtc_[dis|en]able
|
|
|
|
Fixes a FIXME where the overlay plane wouldn't be restored.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 20 +++++++++++---------
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -598,6 +598,8 @@ static void vc4_crtc_mode_set_nofb(struc
|
|
|
|
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
+ struct drm_plane *plane;
|
|
+
|
|
drm_crtc_vblank_off(crtc);
|
|
|
|
/* Always turn the planes off on CRTC disable. In DRM, planes
|
|
@@ -607,23 +609,23 @@ static void vc4_crtc_disable(struct drm_
|
|
* give us a CRTC-level control for that.
|
|
*/
|
|
|
|
- vc4_plane_atomic_disable(crtc->cursor, crtc->cursor->state);
|
|
- vc4_plane_atomic_disable(crtc->primary, crtc->primary->state);
|
|
-
|
|
- /* FIXME: Disable overlay planes */
|
|
+ drm_atomic_crtc_for_each_plane(plane, crtc)
|
|
+ vc4_plane_atomic_disable(plane, plane->state);
|
|
}
|
|
|
|
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
+ struct drm_plane *plane;
|
|
+
|
|
drm_crtc_vblank_on(crtc);
|
|
+
|
|
/* Unblank the planes (if they're supposed to be displayed). */
|
|
+ drm_atomic_crtc_for_each_plane(plane, crtc)
|
|
+ if (plane->state->fb)
|
|
+ vc4_plane_set_blank(plane, plane->state->visible);
|
|
+}
|
|
|
|
- if (crtc->primary->state->fb)
|
|
- vc4_plane_set_blank(crtc->primary, false);
|
|
- if (crtc->cursor->state->fb)
|
|
- vc4_plane_set_blank(crtc->cursor, crtc->cursor->state);
|
|
|
|
- /* FIXME: Enable overlay planes */
|
|
}
|
|
|
|
static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
|