target/linux/bcm27xx/patches-5.4/950-0230-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch

   1 From 50f3c90e2400a0391a7461e5e2fea86ffb3f8f60 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Mon, 4 Mar 2019 11:59:34 -0800
   4 Subject: [PATCH] drm/vc4: Fix oops at boot with firmwarekms on 4.19.
   5
   6 Signed-off-by: Eric Anholt <eric@anholt.net>
   7 ---
   8  drivers/gpu/drm/vc4/vc4_kms.c | 3 +++
   9  1 file changed, 3 insertions(+)
  10
  11 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  12 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  13 @@ -116,6 +116,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
  14         struct vc4_ctm_state *ctm_state = to_vc4_ctm_state(vc4->ctm_manager.state);
  15         struct drm_color_ctm *ctm = ctm_state->ctm;
  16
  17 +       if (vc4->firmware_kms)
  18 +               return;
  19 +
  20         if (ctm_state->fifo) {
  21                 HVS_WRITE(SCALER_OLEDCOEF2,
  22                           VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),