aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch')
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch b/target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
new file mode 100644
index 0000000000..2fd12593d7
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
@@ -0,0 +1,26 @@
+From d75d01225814a7c722affe33f3bfe0ba72fe49a8 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 357/703] 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);
+