openwrt/target/linux/brcm2708/patches-4.19/950-0354-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
Álvaro Fernández Rojas 19226502bf brcm2708: update to latest patches from the RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2019-08-02 18:51:32 +02:00

27 lines
884 B
Diff

From 85081cca82099c3fc27c3eaa9342928ca99e2ede Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Tue, 19 Feb 2019 15:18:25 +0000
Subject: [PATCH 354/725] drm: vc4: Programming the CTM is conditional on
running full KMS
vc4_ctm_commit writes to HVS registers, so this is only applicable
when in full KMS mode, not in firmware KMS mode. Add this conditional.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
drivers/gpu/drm/vc4/vc4_kms.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -147,7 +147,8 @@ vc4_atomic_complete_commit(struct drm_at
drm_atomic_helper_commit_modeset_disables(dev, state);
- vc4_ctm_commit(vc4, state);
+ if (!vc4->firmware_kms)
+ vc4_ctm_commit(vc4, state);
drm_atomic_helper_commit_planes(dev, state, 0);