You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 236758b499086e0de280407396550125f1b6647a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Tue, 9 Apr 2019 18:14:44 +0100
|
|
Subject: [PATCH] from
|
|
vc4_crtc_[en|dis]able
|
|
|
|
vblank needs to be enabled and disabled by the driver to avoid the
|
|
DRM framework complaining in the kernel log.
|
|
|
|
vc4_fkms_disable_vblank needs to signal that we don't want vblank
|
|
callbacks too.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -21,6 +21,7 @@
|
|
#include "drm/drm_fourcc.h"
|
|
#include "drm/drm_probe_helper.h"
|
|
#include "drm/drm_drv.h"
|
|
+#include "drm/drm_vblank.h"
|
|
#include "linux/clk.h"
|
|
#include "linux/debugfs.h"
|
|
#include "drm/drm_fb_cma_helper.h"
|
|
@@ -563,6 +564,8 @@ static void vc4_crtc_mode_set_nofb(struc
|
|
|
|
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
+ drm_crtc_vblank_off(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
|
|
@@ -578,6 +581,7 @@ static void vc4_crtc_disable(struct drm_
|
|
|
|
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
|
|
{
|
|
+ drm_crtc_vblank_on(crtc);
|
|
/* Unblank the planes (if they're supposed to be displayed). */
|
|
|
|
if (crtc->primary->state->fb)
|
|
@@ -674,6 +678,9 @@ static int vc4_fkms_enable_vblank(struct
|
|
|
|
static void vc4_fkms_disable_vblank(struct drm_crtc *crtc)
|
|
{
|
|
+ struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
+
|
|
+ vc4_crtc->vblank_enabled = false;
|
|
}
|
|
|
|
static const struct drm_crtc_funcs vc4_crtc_funcs = {
|