From 20ea5c490d77eb7481d610c204e91344edc164a4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Tue, 19 Feb 2019 15:18:25 +0000 Subject: [PATCH 357/432] 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 --- 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 f4d8a730e821..baf9bd7931ac 100644 --- 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_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); -- 2.19.1