git.librecmc.org Git - oweals/openwrt.git/blob

   1 From c4e9410fc4e06792f4b895b9bfbd70f5e842c7de Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Tue, 19 Feb 2019 15:18:25 +0000
   4 Subject: [PATCH 352/773] drm: vc4: Programming the CTM is conditional on
   5  running full KMS
   6
   7 vc4_ctm_commit writes to HVS registers, so this is only applicable
   8 when in full KMS mode, not in firmware KMS mode. Add this conditional.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_kms.c | 3 ++-
  13  1 file changed, 2 insertions(+), 1 deletion(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  17 @@ -147,7 +147,8 @@ vc4_atomic_complete_commit(struct drm_at
  18
  19         drm_atomic_helper_commit_modeset_disables(dev, state);
  20
  21 -       vc4_ctm_commit(vc4, state);
  22 +       if (!vc4->firmware_kms)
  23 +               vc4_ctm_commit(vc4, state);
  24
  25         drm_atomic_helper_commit_planes(dev, state, 0);
  26