summaryrefslogtreecommitdiffstats
path: root/sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch')
-rw-r--r--sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch b/sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
new file mode 100644
index 00000000..298344c7
--- /dev/null
+++ b/sys-kernel/boest-v5.0.15/raspberrypi/0169-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch
@@ -0,0 +1,28 @@
+From 1649e746add25286c2833e5cb052a9069f95162d 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 169/194] 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(-)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
+index 76248870a1a7..aa0ac580b2ea 100644
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -145,7 +145,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
+
+ 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);
+