From 2340c646e6a5da658e114be2f721ff90853588d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 9 Aug 2019 19:50:30 +0200 Subject: brcm2708: update to latest patches from RPi foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- ...gramming-the-CTM-is-conditional-on-runnin.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 target/linux/brcm2708/patches-4.19/950-0352-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch (limited to 'target/linux/brcm2708/patches-4.19/950-0352-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch') diff --git a/target/linux/brcm2708/patches-4.19/950-0352-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch b/target/linux/brcm2708/patches-4.19/950-0352-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch new file mode 100644 index 0000000000..2aefdc3c39 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0352-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch @@ -0,0 +1,26 @@ +From c4e9410fc4e06792f4b895b9bfbd70f5e842c7de Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Tue, 19 Feb 2019 15:18:25 +0000 +Subject: [PATCH 352/773] 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(-) + +--- 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_at + + 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); + -- cgit v1.2.3