mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
a34255b795
Removed upstreamed: bcm27xx/patches-5.15/950-0446-drm-vc4-Fix-timings-for-VEC-modes.patch[1] Manually rebased: patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All other patches automatically rebased 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.75&id=2810061452f9b748b096ad023d318690ca519aa3 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From 749ff7fb1f2382f19ed744a86e82211711187db2 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 8 Nov 2021 18:25:49 +0000
|
|
Subject: [PATCH] drm/vc4: Only add gamma properties once.
|
|
|
|
Two calls were made to drm_crtc_enable_color_mgmt to add gamma
|
|
and CTM, however they were both set to add the gamma properties,
|
|
so they ended up added twice.
|
|
|
|
Fixes: 766cc6b1f7fc "drm/vc4: Add CTM support"
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -1180,7 +1180,7 @@ int vc4_crtc_init(struct drm_device *drm
|
|
/* We support CTM, but only for one CRTC at a time. It's therefore
|
|
* implemented as private driver state in vc4_kms, not here.
|
|
*/
|
|
- drm_crtc_enable_color_mgmt(crtc, 0, true, crtc->gamma_size);
|
|
+ drm_crtc_enable_color_mgmt(crtc, 0, true, 0);
|
|
|
|
/* Initialize the VC4 gamma LUTs */
|
|
for (i = 0; i < crtc->gamma_size; i++) {
|