]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/ingenic: Fix pixclock rate for 24-bit serial panels
authorPaul Cercueil <paul@crapouillou.net>
Tue, 23 Mar 2021 14:40:08 +0000 (14:40 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 08:01:17 +0000 (10:01 +0200)
commit 60a6b73dd821e98fe958b2a83393ccd724b306b1 upstream.

When using a 24-bit panel on a 8-bit serial bus, the pixel clock
requested by the panel has to be multiplied by 3, since the subpixels
are shifted sequentially.

The code (in ingenic_drm_encoder_atomic_check) already computed
crtc_state->adjusted_mode->crtc_clock accordingly, but clk_set_rate()
used crtc_state->adjusted_mode->clock instead.

Fixes: 28ab7d35b6e0 ("drm/ingenic: Properly compute timings when using a 3x8-bit panel")
Cc: stable@vger.kernel.org # v5.10
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: H. Nikolaus Schaller <hns@goldelico.com> # CI20/jz4780 (HDMI) and Alpha400/jz4730 (LCD)
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323144008.166248-1-paul@crapouillou.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/ingenic/ingenic-drm-drv.c

index fd8870edde0ed7e64b04a9e7cc24f8307d7d7a28..9580ac3312cd172a6abd7217ab2b1e792815ed95 100644 (file)
@@ -341,7 +341,7 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc,
        if (priv->update_clk_rate) {
                mutex_lock(&priv->clk_mutex);
                clk_set_rate(priv->pix_clk,
-                            crtc_state->adjusted_mode.clock * 1000);
+                            crtc_state->adjusted_mode.crtc_clock * 1000);
                priv->update_clk_rate = false;
                mutex_unlock(&priv->clk_mutex);
        }