From nobody Fri Oct 24 10:15:09 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3A5EC00140 for ; Mon, 15 Aug 2022 20:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242426AbiHOURY (ORCPT ); Mon, 15 Aug 2022 16:17:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346652AbiHOULy (ORCPT ); Mon, 15 Aug 2022 16:11:54 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C86E49B4A; Mon, 15 Aug 2022 11:58:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id AF4B3CE129B; Mon, 15 Aug 2022 18:58:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 974D5C433C1; Mon, 15 Aug 2022 18:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660589879; bh=DlTQ8VDIbg09Ihg4xGaCCRBq46cuKg5QQPnMUByFDZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vj0HfIDBTrCRqSMUgSPcKzM0bMCWHMNX45xuSdd3SSs1dENItYyU8H7qaWqwt1lLS oIXHlzzI3XAT8WcMJmYlw0yHDGuxie8y3tjtQ38izColecYYiLOhTCf1hYCJKJnMz7 iKdRp1xp/1pKdXRgWop6QhvXXzP+2JnWv8EUy5CQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Cercueil , Sam Ravnborg , Christophe Branchereau Subject: [PATCH 5.18 0078/1095] drm/ingenic: Use the highest possible DMA burst size Date: Mon, 15 Aug 2022 19:51:17 +0200 Message-Id: <20220815180432.756102850@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Paul Cercueil commit f0dce5c4fdaf9e98dd2755ffb1363822854b6287 upstream. Until now, when running at the maximum resolution of 1280x720 at 32bpp on the JZ4770 SoC the output was garbled, the X/Y position of the top-left corner of the framebuffer warping to a random position with the whole image being offset accordingly, every time a new frame was being submitted. This problem can be eliminated by using a bigger burst size for the DMA. Set in each soc_info structure the maximum burst size supported by the corresponding SoC, and use it in the driver. Set the new value using regmap_update_bits() instead of regmap_set_bits(), since we do want to override the old value of the burst size. (Note that regmap_set_bits() wasn't really valid before for the same reason, but it never seemed to be a problem). Cc: Fixes: 90b86fcc47b4 ("DRM: Add KMS driver for the Ingenic JZ47xx SoCs") Signed-off-by: Paul Cercueil Link: https://patchwork.freedesktop.org/patch/msgid/20220702230727.66704-1-= paul@crapouillou.net Acked-by: Sam Ravnborg Tested-by: Christophe Branchereau Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 10 ++++++++-- drivers/gpu/drm/ingenic/ingenic-drm.h | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -69,6 +69,7 @@ struct jz_soc_info { bool map_noncoherent; bool use_extended_hwdesc; bool plane_f0_not_working; + u32 max_burst; unsigned int max_width, max_height; const u32 *formats_f0, *formats_f1; unsigned int num_formats_f0, num_formats_f1; @@ -308,8 +309,9 @@ static void ingenic_drm_crtc_update_timi regmap_write(priv->map, JZ_REG_LCD_REV, mode->htotal << 16); } =20 - regmap_set_bits(priv->map, JZ_REG_LCD_CTRL, - JZ_LCD_CTRL_OFUP | JZ_LCD_CTRL_BURST_16); + regmap_update_bits(priv->map, JZ_REG_LCD_CTRL, + JZ_LCD_CTRL_OFUP | JZ_LCD_CTRL_BURST_MASK, + JZ_LCD_CTRL_OFUP | priv->soc_info->max_burst); =20 /* * IPU restart - specify how much time the LCDC will wait before @@ -1480,6 +1482,7 @@ static const struct jz_soc_info jz4740_s .map_noncoherent =3D false, .max_width =3D 800, .max_height =3D 600, + .max_burst =3D JZ_LCD_CTRL_BURST_16, .formats_f1 =3D jz4740_formats, .num_formats_f1 =3D ARRAY_SIZE(jz4740_formats), /* JZ4740 has only one plane */ @@ -1491,6 +1494,7 @@ static const struct jz_soc_info jz4725b_ .map_noncoherent =3D false, .max_width =3D 800, .max_height =3D 600, + .max_burst =3D JZ_LCD_CTRL_BURST_16, .formats_f1 =3D jz4725b_formats_f1, .num_formats_f1 =3D ARRAY_SIZE(jz4725b_formats_f1), .formats_f0 =3D jz4725b_formats_f0, @@ -1503,6 +1507,7 @@ static const struct jz_soc_info jz4770_s .map_noncoherent =3D true, .max_width =3D 1280, .max_height =3D 720, + .max_burst =3D JZ_LCD_CTRL_BURST_64, .formats_f1 =3D jz4770_formats_f1, .num_formats_f1 =3D ARRAY_SIZE(jz4770_formats_f1), .formats_f0 =3D jz4770_formats_f0, @@ -1517,6 +1522,7 @@ static const struct jz_soc_info jz4780_s .plane_f0_not_working =3D true, /* REVISIT */ .max_width =3D 4096, .max_height =3D 2048, + .max_burst =3D JZ_LCD_CTRL_BURST_64, .formats_f1 =3D jz4770_formats_f1, .num_formats_f1 =3D ARRAY_SIZE(jz4770_formats_f1), .formats_f0 =3D jz4770_formats_f0, --- a/drivers/gpu/drm/ingenic/ingenic-drm.h +++ b/drivers/gpu/drm/ingenic/ingenic-drm.h @@ -106,6 +106,9 @@ #define JZ_LCD_CTRL_BURST_4 (0x0 << 28) #define JZ_LCD_CTRL_BURST_8 (0x1 << 28) #define JZ_LCD_CTRL_BURST_16 (0x2 << 28) +#define JZ_LCD_CTRL_BURST_32 (0x3 << 28) +#define JZ_LCD_CTRL_BURST_64 (0x4 << 28) +#define JZ_LCD_CTRL_BURST_MASK (0x7 << 28) #define JZ_LCD_CTRL_RGB555 BIT(27) #define JZ_LCD_CTRL_OFUP BIT(26) #define JZ_LCD_CTRL_FRC_GRAYSCALE_16 (0x0 << 24)