2019-09-04 17:01:23 +00:00
|
|
|
From ce4eebebec4a6d667db60f1904f3718e3513afc5 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Mon, 4 Mar 2019 11:59:34 -0800
|
2019-09-04 17:01:23 +00:00
|
|
|
Subject: [PATCH 574/782] drm/vc4: Fix oops at boot with firmwarekms on 4.19.
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 3 +++
|
|
|
|
|
1 file changed, 3 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
|
|
|
@@ -107,6 +107,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
|
|
|
|
|
struct vc4_ctm_state *ctm_state = to_vc4_ctm_state(vc4->ctm_manager.state);
|
|
|
|
|
struct drm_color_ctm *ctm = ctm_state->ctm;
|
|
|
|
|
|
|
|
|
|
+ if (vc4->firmware_kms)
|
|
|
|
|
+ return;
|
|
|
|
|
+
|
|
|
|
|
if (ctm_state->fifo) {
|
|
|
|
|
HVS_WRITE(SCALER_OLEDCOEF2,
|
|
|
|
|
VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),
|
