From patchwork Thu Aug 3 11:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 130567 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1127400vqx; Thu, 3 Aug 2023 05:57:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdeJTq7Ur+KSzBHgVmBw4ZoC5xgYuFh5Ws6h6x7dpCaokeP0AnYr8aBWPfyBXo54ba6VBB X-Received: by 2002:a17:906:7397:b0:99b:ef8a:d64a with SMTP id f23-20020a170906739700b0099bef8ad64amr8485995ejl.0.1691067472177; Thu, 03 Aug 2023 05:57:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691067472; cv=none; d=google.com; s=arc-20160816; b=TmvXOA6+dlF6uLcSblAYpBI2Phg2kEtOblONGSM3VDhHP59xJ/g9ara3qIL/NV/14U kpJCXeXe4eajZPgjOaU1KWUSEalWBL6vzNEEtgUsWrqFvlpyFM47ZIpcr4LiVYg7Pek/ ytGs2ZI0NviTeZxFvP4PyqFJKyGURkSnZ5I6AwwJxWiX1ijui5aI0hL3kXKTPwEgA89J +444ehH85aELvax8qK8RO6xU9Ti8Hdmhu7/W2txEyK90Ysxm2UIoAeAiWVD0wjxBQIEx 1xR+Zaokx85U8QKqYH8uNgSVC9HAWXgqDlqmfI3W5q0OMuGR4lznZZ/GYCMrMQpeUxTx Jt/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dm6Nc3M0XahRr5SgCwL2z7cNin/dAvbdfmHjVdvJV98=; fh=wVZEQimxp/UyE4Mf0Sn+nsZcfrBLHvkvU7kacOC/59o=; b=zI5aX9V9OxGrPVLvLLERAz3vr05XfHI52mJSYjele2OqImCW2l0NfT6WOj+rebRFBt MmP6hc5PcAXlIz68Fu7LfPBYupirE9esrdkAADtSF+V9Ror1D4FUD1N9Zqh/C6HjldLa JD3S0X1hcYwUYalYGo4jmiqwpjAxcXNxYy0YBRTtAjku2VTJXxlkL1gDlE1nbMQSFGrN 4wPo7ZzgiKx7MhZkz4/PYhPS39g8whirFzzEZqVwOjz+K8acpSi75W9WCDRgnClDQgyB L9n1tnQ5r1h8LaEfFQKCNRgIi5RYA14ApcA+xyKaxf915+tl8VbM9cxPqQ/9FyWSiB6T VXtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="l/u3vbOw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gq15-20020a170906e24f00b00998f7d25ea7si10843533ejb.815.2023.08.03.05.57.29; Thu, 03 Aug 2023 05:57:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="l/u3vbOw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235727AbjHCLDK (ORCPT + 99 others); Thu, 3 Aug 2023 07:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234881AbjHCLC3 (ORCPT ); Thu, 3 Aug 2023 07:02:29 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DF0730EA for ; Thu, 3 Aug 2023 04:02:28 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 5F43366071A0; Thu, 3 Aug 2023 12:02:25 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691060546; bh=jQ1ukxJYhgqz3VRiaaOzbMrQXLA2ENp1Hjs7vpajFxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l/u3vbOwy8Eea9VxnGCM+QJuc7g6GI9gnt7WTLuaItIbqLswCF1/icgiTSSaum7Lt lqfn5xDMOouKt6W7pzpUi0pUih+xJBwe2n80KeOhVU8UNYtIaAeO/HBV1Pzk5kr+nW AFhdHGuqIe8UdHkaeAjPii5SKaqu2IAbJXE6+FyoMOQvBrq1vLFm+FNYNBgH9wg0Q+ UGdkbORjio8oCW3+gHcBZK084UQ95lnuNSQhP92KiSjU1Ne1L4PwJWuYsZNUUoaxC6 zpMQjX6pLWrLUlSuW0QkgxpxULXIVgCa8oCs8tghfH1pFkz4qvlUTm/2q7rYMkQvhj Yyk3Jx273gqWg== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, wenst@chromium.org, kernel@collabora.com, ehristev@collabora.com, "Jason-JH . Lin" , Alexandre Mergnat Subject: [PATCH v9 05/16] drm/mediatek: gamma: Enable the Gamma LUT table only after programming Date: Thu, 3 Aug 2023 13:02:03 +0200 Message-ID: <20230803110214.163645-6-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230803110214.163645-1-angelogioacchino.delregno@collabora.com> References: <20230803110214.163645-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773212765449864497 X-GMAIL-MSGID: 1773212765449864497 Move the write to DISP_GAMMA_CFG to enable the Gamma LUT to after programming the actual table to avoid potential visual glitches during table modification. Note: GAMMA should get enabled in between vblanks, but this requires many efforts in order to make this happen, as that requires migrating all of the writes to make use of CMDQ instead of cpu writes and that's not trivial. For this reason, this patch only moves the LUT enable. The CMDQ rework will come at a later time. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Jason-JH.Lin Reviewed-by: Alexandre Mergnat --- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index fd6a75a64a9f..18b102bef370 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -68,12 +68,12 @@ unsigned int mtk_gamma_get_lut_size(struct device *dev) void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state) { struct mtk_disp_gamma *gamma; - unsigned int i, reg; + unsigned int i; struct drm_color_lut *lut; void __iomem *lut_base; bool lut_diff; u16 lut_size; - u32 word; + u32 cfg_val, word; /* If there's no gamma lut there's nothing to do here. */ if (!state->gamma_lut) @@ -90,9 +90,7 @@ void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crt lut_size = LUT_SIZE_DEFAULT; } - reg = readl(regs + DISP_GAMMA_CFG); - reg = reg | GAMMA_LUT_EN; - writel(reg, regs + DISP_GAMMA_CFG); + cfg_val = readl(regs + DISP_GAMMA_CFG); lut_base = regs + DISP_GAMMA_LUT; lut = (struct drm_color_lut *)state->gamma_lut->data; for (i = 0; i < lut_size; i++) { @@ -122,6 +120,11 @@ void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crt } writel(word, (lut_base + i * 4)); } + + /* Enable the gamma table */ + cfg_val = cfg_val | GAMMA_LUT_EN; + + writel(cfg_val, regs + DISP_GAMMA_CFG); } void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)