From patchwork Thu Jul 27 09:46:23 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: 126902 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1009222vqo; Thu, 27 Jul 2023 03:52:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHvOAv/Pn26E9fLKp+6GSSP6SKRYBobtkJWY3YrMyJFUdFyhHdA1TuIhAy268Gu3erqrQO X-Received: by 2002:a17:906:1084:b0:992:7329:fe4f with SMTP id u4-20020a170906108400b009927329fe4fmr1410937eju.73.1690455153327; Thu, 27 Jul 2023 03:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690455153; cv=none; d=google.com; s=arc-20160816; b=q/B5+IAXv7Uj8yWx3ILVDFR3boY1K2PlP2w8oF0mWWd3r/dLeTeN3MqqTkM8gL+9Co Wlp4W5jP+rEBJORkZlkO2eWuER7gowfZYCEi9JN07W+xzHlVIFpy/xlDV4R0FCixNLuA R0Im/cE4yxk7vqUJP1caZDfWHXRJDzLKAPrsoT5fJ1aimrHV3hym/NdmtQ7qP29Vk/pR xkUQl6ePxhzRRl1r8NjZkHoOP/icii8OuLXlokkBp3ULzvyaUlxFKzpNtH1KRSG8255/ eTjVjEHRsft9BNOa6JiQ74uA8CocPTJ5e56xpPwIIYHx3ctggpcliTg/Wp+9b0gsIkLS Hblg== 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=ZeueyH8CDgooMtutBLaT2Zvz13XZWzsV4aU7WjAbI+M=; fh=AiGx2qgQkEJ+As1seszN5ep8TBO2II0ZJS4BeTA/CJg=; b=UsyM4jbD7zSwrkjzieAH8Qu2P3S0i5l0hP464ipB2CFHsQjE6kNIW4hMcrdroS11Pi PflcVaQFK51qgBd+iyuJWqaMQhXZT2otSc4DijLg5nCXw3Nv704SmwlPzKEagzpI+ErK pFDDa3KjR3E3jXHyPYTHi4kinaZTbU9Km4qfrJ+ooEIjdhnl96hE0rUrs5TQMWGgXxuu u5u4axv/8igTm19ruE6/wwLYNMMgPuCADf1c6TJB3EKxedeDgAdPXjc4xl0gGRNqKoEu 5OI68/oQS/aw/cLDBipH/40ie1rCtA2rfqBnupIk3DbCN16NT4tFlJ88pQBBVVLeq8Ky 4ICQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=GNDFeRzV; 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 gz21-20020a170906f2d500b00982a5377650si769172ejb.247.2023.07.27.03.52.09; Thu, 27 Jul 2023 03:52:33 -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=GNDFeRzV; 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 S232479AbjG0Jqq (ORCPT + 99 others); Thu, 27 Jul 2023 05:46:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231926AbjG0Jqn (ORCPT ); Thu, 27 Jul 2023 05:46:43 -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 6A3D79C for ; Thu, 27 Jul 2023 02:46:40 -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 71F106607038; Thu, 27 Jul 2023 10:46:38 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1690451199; bh=fWabP2S9MKC6+Yi0YWqUcPZxSafl399il5KPixyXdlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GNDFeRzVs6QPZXYFmo2+Yo+uGRJp5pI8JcZsX/wBAA4zHsAZmUKdT45pdJoRvdiZb wdNNokY6HuV1ejUnZO4snwxb5wD6+y8y8lBavhRmIpPf5yM7aNk080z39PIQs/M6yf jkfzPruKcyN0jdNMSkKSqt3Kx7GUqQMl8vdnX7ZCT5mvHdGQplc2wpgsV3T7syqW/A YqBQQ0AY0shoevDu5mC+zBqeEX7dqRaZ0Ph1y39r1sDFB2zCANjDOxdiAszo4YwrCX B8H1e+Vu3rBqh55vPYJ6176pFTZkThz+F4JDhirCqED1gZZOE6REYwKiiRiqdkVT3j Rb0DXU96qN0zg== 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" Subject: [PATCH RESEND v6 01/11] drm/mediatek: gamma: Adjust mtk_drm_gamma_set_common parameters Date: Thu, 27 Jul 2023 11:46:23 +0200 Message-ID: <20230727094633.22505-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230727094633.22505-1-angelogioacchino.delregno@collabora.com> References: <20230727094633.22505-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: 1772570702679243305 X-GMAIL-MSGID: 1772570702679243305 From: "Jason-JH.Lin" Adjust the parameters in mtk_drm_gamma_set_common() - add (struct device *dev) to get lut_diff from gamma's driver data - remove (bool lut_diff) and use false as default value in the function Signed-off-by: Jason-JH.Lin Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Alexandre Mergnat --- drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c index 434e8a9ce8ab..8ddf7a97e583 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c @@ -67,7 +67,7 @@ void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) struct mtk_disp_aal *aal = dev_get_drvdata(dev); if (aal->data && aal->data->has_gamma) - mtk_gamma_set_common(aal->regs, state, false); + mtk_gamma_set_common(NULL, aal->regs, state); } void mtk_aal_start(struct device *dev) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h index 2254038519e1..75045932353e 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h @@ -54,7 +54,7 @@ void mtk_gamma_config(struct device *dev, unsigned int w, unsigned int h, unsigned int vrefresh, unsigned int bpc, struct cmdq_pkt *cmdq_pkt); void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state); -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff); +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state); void mtk_gamma_start(struct device *dev); void mtk_gamma_stop(struct device *dev); diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index c844942603f7..99be515a941b 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -55,14 +55,21 @@ void mtk_gamma_clk_disable(struct device *dev) clk_disable_unprepare(gamma->clk); } -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff) +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state) { + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); unsigned int i, reg; struct drm_color_lut *lut; void __iomem *lut_base; + bool lut_diff; u32 word; u32 diff[3] = {0}; + if (gamma && gamma->data) + lut_diff = gamma->data->lut_diff; + else + lut_diff = false; + if (state->gamma_lut) { reg = readl(regs + DISP_GAMMA_CFG); reg = reg | GAMMA_LUT_EN; @@ -92,12 +99,8 @@ void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) { struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); - bool lut_diff = false; - - if (gamma->data) - lut_diff = gamma->data->lut_diff; - mtk_gamma_set_common(gamma->regs, state, lut_diff); + mtk_gamma_set_common(dev, gamma->regs, state); } void mtk_gamma_config(struct device *dev, unsigned int w,