blob: 2aefdc3c39139d284a42e5b7cc087660ec840fe8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From c4e9410fc4e06792f4b895b9bfbd70f5e842c7de 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 352/773] 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);
|
