drm/sun4i: frontend: Move CSC bypass setup to format update routine

In order to support YUV to RGB conversion with the frontend (which is
generally used for connecting with the backend), the CSC block must not
be bypassed.

As a result, the bit to enable CSC bypass is moved from the runtime
resume routine to the format update routine, so that it can disabled
when introducing support for YUV formats later.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181123092515.2511-17-paul.kocialkowski@bootlin.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.c b/drivers/gpu/drm/sun4i/sun4i_frontend.c
index 0f7f8c7b340228702282672e462a07eba661ae24..f54b1c4a926472be1b4d9321ec7f1bd8910a485d 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.c
@@ -177,6 +177,10 @@ int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
        regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_VERTPHASE1_REG, 0x400);
        regmap_write(frontend->regs, SUN4I_FRONTEND_CH1_VERTPHASE1_REG, 0x400);
 
+       regmap_update_bits(frontend->regs, SUN4I_FRONTEND_BYPASS_REG,
+                          SUN4I_FRONTEND_BYPASS_CSC_EN,
+                          SUN4I_FRONTEND_BYPASS_CSC_EN);
+
        regmap_write(frontend->regs, SUN4I_FRONTEND_INPUT_FMT_REG,
                     SUN4I_FRONTEND_INPUT_FMT_DATA_MOD(1) |
                     SUN4I_FRONTEND_INPUT_FMT_DATA_FMT(in_fmt_val) |
@@ -354,10 +358,6 @@ static int sun4i_frontend_runtime_resume(struct device *dev)
                           SUN4I_FRONTEND_EN_EN,
                           SUN4I_FRONTEND_EN_EN);
 
-       regmap_update_bits(frontend->regs, SUN4I_FRONTEND_BYPASS_REG,
-                          SUN4I_FRONTEND_BYPASS_CSC_EN,
-                          SUN4I_FRONTEND_BYPASS_CSC_EN);
-
        sun4i_frontend_scaler_init(frontend);
 
        return 0;