diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:01:23 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:02:48 +0200 |
| commit | 662394fb30fdbcc89ec387918714aebee6868a9f (patch) | |
| tree | c308c5f1a650abf9d9ccbb2a1747469a0d8570c0 /target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch | |
| parent | 99a5e285887c4a10aaf06d8e01fae0707995da00 (diff) | |
| download | upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.gz upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.bz2 upstream-662394fb30fdbcc89ec387918714aebee6868a9f.zip | |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch b/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch new file mode 100644 index 0000000000..e12e4278f7 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0574-drm-vc4-Fix-oops-at-boot-with-firmwarekms-on-4.19.patch @@ -0,0 +1,22 @@ +From ce4eebebec4a6d667db60f1904f3718e3513afc5 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Mon, 4 Mar 2019 11:59:34 -0800 +Subject: [PATCH 574/782] drm/vc4: Fix oops at boot with firmwarekms on 4.19. + +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]), |