| From 973ca1329ac445e55135e01874118d4e28392ea7 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] 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 |
| @@ -166,7 +166,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); |
| |