You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 9e134cea82d5c69e5d564e87cda2b5cf3ec14768 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 21 Feb 2020 16:54:21 +0100
|
|
Subject: [PATCH] drm/vc4: crtc: Disable color management for HVS5
|
|
|
|
The HVS5 uses different color matrices. Disable color management support
|
|
for now.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -441,7 +441,7 @@ static void vc4_crtc_mode_set_nofb(struc
|
|
|
|
HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel),
|
|
SCALER_DISPBKGND_AUTOHS |
|
|
- SCALER_DISPBKGND_GAMMA |
|
|
+ ((!vc4->hvs->hvs5) ? SCALER_DISPBKGND_GAMMA : 0) |
|
|
(interlace ? SCALER_DISPBKGND_INTERLACE : 0));
|
|
|
|
/* Reload the LUT, since the SRAMs would have been disabled if
|
|
@@ -1156,6 +1156,7 @@ static int vc4_crtc_bind(struct device *
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
struct drm_device *drm = dev_get_drvdata(master);
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(drm);
|
|
struct vc4_crtc *vc4_crtc;
|
|
struct drm_crtc *crtc;
|
|
struct drm_plane *primary_plane, *destroy_plane, *temp;
|
|
@@ -1197,12 +1198,16 @@ static int vc4_crtc_bind(struct device *
|
|
drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
|
|
&vc4_crtc_funcs, NULL);
|
|
drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);
|
|
- drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
|
|
|
|
- /* 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);
|
|
+ if (!vc4->hvs->hvs5) {
|
|
+ drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
|
|
+
|
|
+ /* 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);
|
|
+ }
|
|
|
|
CRTC_WRITE(PV_INTEN, 0);
|
|
CRTC_WRITE(PV_INTSTAT, PV_INT_VFP_START);
|