2019-09-19 14:43:19 +00:00
|
|
|
From d4df2766945e0410d1975434f34e647e7e13b992 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
Date: Wed, 10 Apr 2019 17:43:57 +0100
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] drm: vc4: Bring fkms into line with kms in blocking
|
2019-07-09 18:32:28 +00:00
|
|
|
doublescan modes
|
|
|
|
|
|
|
|
|
|
Implement vc4_crtc_mode_valid so that it blocks doublescan modes
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 15 +++++++++++++--
|
|
|
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
@@ -625,7 +625,17 @@ static void vc4_crtc_enable(struct drm_c
|
|
|
|
|
vc4_plane_set_blank(plane, plane->state->visible);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+static enum drm_mode_status
|
|
|
|
|
+vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
|
|
|
|
|
+{
|
|
|
|
|
+ /* Do not allow doublescan modes from user space */
|
|
|
|
|
+ if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
|
|
|
|
|
+ DRM_DEBUG_KMS("[CRTC:%d] Doublescan mode rejected.\n",
|
|
|
|
|
+ crtc->base.id);
|
|
|
|
|
+ return MODE_NO_DBLESCAN;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
+ return MODE_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
|
|
|
|
|
@@ -735,10 +745,11 @@ static const struct drm_crtc_funcs vc4_c
|
|
|
|
|
|
|
|
|
|
static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
|
|
|
|
|
.mode_set_nofb = vc4_crtc_mode_set_nofb,
|
|
|
|
|
- .atomic_disable = vc4_crtc_disable,
|
|
|
|
|
- .atomic_enable = vc4_crtc_enable,
|
|
|
|
|
+ .mode_valid = vc4_crtc_mode_valid,
|
|
|
|
|
.atomic_check = vc4_crtc_atomic_check,
|
|
|
|
|
.atomic_flush = vc4_crtc_atomic_flush,
|
|
|
|
|
+ .atomic_enable = vc4_crtc_enable,
|
|
|
|
|
+ .atomic_disable = vc4_crtc_disable,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct of_device_id vc4_firmware_kms_dt_match[] = {
|
