raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 10:29:52 +00:00
Code Issues Projects Releases Wiki Activity

drm: vc4: Iterate over all planes in vc4_crtc_[dis|en]able

Browse Source 
Fixes a FIXME where the overlay plane wouldn't be restored.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
This commit is contained in:
Dave Stevenson
2019-04-10 17:42:37 +01:00
committed by popcornmix
parent 19c272deb4
commit 3d81eba10e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/vc4/vc4_firmware_kms.c
View File

@@ -598,6 +598,8 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state) static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{ {
struct drm_plane *plane;
drm_crtc_vblank_off(crtc); drm_crtc_vblank_off(crtc);
/* Always turn the planes off on CRTC disable. In DRM, planes /* Always turn the planes off on CRTC disable. In DRM, planes
@@ -607,23 +609,23 @@ static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_s
* give us a CRTC-level control for that. * give us a CRTC-level control for that.
*/ */
vc4_plane_atomic_disable(crtc->cursor, crtc->cursor->state); drm_atomic_crtc_for_each_plane(plane, crtc)
vc4_plane_atomic_disable(crtc->primary, crtc->primary->state); vc4_plane_atomic_disable(plane, plane->state);
/* FIXME: Disable overlay planes */
} }
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_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); drm_crtc_vblank_on(crtc);
/* Unblank the planes (if they're supposed to be displayed). */ /* 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, static int vc4_crtc_atomic_check(struct drm_crtc *crtc,