mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-17 19:05:29 +08:00
7c7a6f2e55
* generic: support mtd-mac-address-ascii * kernel: bump to 4.9.208, 4.14.162, 4.19.93 * bcm2708: sync from openwrt v19.07 * firmware: update to latest version * correct mistakes * ipq40xx: fixed wrong patch
27 lines
876 B
Diff
27 lines
876 B
Diff
From bb8e85deab20dd38c26d354452e1ac42add37530 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Tue, 19 Feb 2019 15:18:25 +0000
|
|
Subject: [PATCH] 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 <dave.stevenson@raspberrypi.org>
|
|
---
|
|
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);
|
|
|