From patchwork Mon Jun 12 09:01:48 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: 106387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2467226vqr; Mon, 12 Jun 2023 02:50:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zB5QevZ++KQk+dxiBqO4rymCUoOd2//O+YrbrJs/0H3MgJUkshIaZ2C1K8C6Q8ETy9p4h X-Received: by 2002:a17:903:1103:b0:1af:e302:123 with SMTP id n3-20020a170903110300b001afe3020123mr7740834plh.3.1686563452265; Mon, 12 Jun 2023 02:50:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686563452; cv=none; d=google.com; s=arc-20160816; b=qD1mbJBdNsy+3c+V9qhgkTknEZAB7ZgXTACVA+FNfvhWXepIUMA6+ojfhK0/9JCjlu QSpuSaNAu2GulbB2OGR+Qb9/qp/Bin8RBr/+uJLeOCYDA/IpxWUo6vk9uy9wuKrSiu01 cWouiiyZEAj9i2OwNHaRJrWRrNwGFAhxKyuXyHhFb9/y+qxq88xHDC0/yTDajm6qOzDi amBcyP2LZhblB/dw+wquuGS72wxcWyt8UcfOm5an6y59MAypud5UNVxW4hOKvGLTFEYO yVJ1BetgnawwLX0xquxkSG86e22Qy5izReD/fWQw74Bi5s5TbhpbcKcmTVMSpKiIQyN4 +Vtg== 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=oDZdjfx700FCXUnExZA7N92qMxI3xpd6M2geNmql5YU=; b=yksfaOjVMklLhRXQ+tpPz9BPYCermNiGNvvq6E1y1akmx4R3IxRj5sKzC0LSw/z92g V9nqhlAc5qVM5Uz6RiXpMTbvvPRhoNsWNYC0Mi7w7NsDBf3NxY3xkQcx+SX0pOeJyrIB uNdqB9frLu3hxCSuAsyxoctUW5/PIyi8anFkl02Bfw+MDNNisQTeAGYf9Odyzc27Zh2f 7XYSRygx7snfUMguJ88+ZUYO02owVABP1+Zx0kf6BneM2j7xS+9ZlMFiIuRLpJbvxjgR U/nRlvY118OBapuKnhF5phgN5aGDvaKr2M/hrdiSSDJh3gGEbEMh0qyVkKXbUvaiahOZ pFLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aY658Q+0; 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 e6-20020a170902cf4600b001b2085066d9si2888986plg.584.2023.06.12.02.50.40; Mon, 12 Jun 2023 02:50: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=aY658Q+0; 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 S233174AbjFLJGA (ORCPT + 99 others); Mon, 12 Jun 2023 05:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232978AbjFLJFZ (ORCPT ); Mon, 12 Jun 2023 05:05:25 -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 A791E3C0E for ; Mon, 12 Jun 2023 02:02:05 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (unknown [IPv6:2001:b07:2ed:14ed:c5f8:7372:f042:90a2]) (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 9DC226606E98; Mon, 12 Jun 2023 10:02:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686560524; bh=H1IjE6ks2/tQ62I5k+mdDy0LWtBtFX34NVlBCrVhdQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aY658Q+0Pi1xzDSNlEuUHVLmbLxgSQzTuQ1rn4R9okTSDsKzZcjtMgyKxKNrxIBmb SeL9adZxHbCIHp4YIplc2SBlGGUSJrIF4vWoHTBwD7XpoSyNJSShL/byRlgLFwFCJt q/1HHD8rdCMbbGAWSw2PVb835Nf2G1J4s1L+sgz0iEZm8XMUEksUod6dUo+JwI3kVL eKIEbITYzKrz3e7D3LOPTXOcQEVGtoBSrTaFBG9mpf+W33lMs4A5ZPS1c13lpFK/EH X3VRzfq6ly881hcHDyemwEXJadguxj2ONDcOIpHSdlOu5iSp9i2r5bT3xPWKR/kzJL KvqSS5oVCJLOw== 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, "Jason-JH . Lin" Subject: [PATCH v6 02/11] drm/mediatek: gamma: Reduce indentation in mtk_gamma_set_common() Date: Mon, 12 Jun 2023 11:01:48 +0200 Message-Id: <20230612090157.68205-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612090157.68205-1-angelogioacchino.delregno@collabora.com> References: <20230612090157.68205-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768489958307676650?= X-GMAIL-MSGID: =?utf-8?q?1768489958307676650?= Invert the check for state->gamma_lut and move it at the beginning of the function to reduce indentation: this prepares the code for keeping readability on later additions. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Jason-JH.Lin --- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 45 ++++++++++++----------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index 99be515a941b..ce6f2499b891 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -65,34 +65,35 @@ void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crt u32 word; u32 diff[3] = {0}; + /* If there's no gamma lut there's nothing to do here. */ + if (!state->gamma_lut) + return; + 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; - writel(reg, regs + DISP_GAMMA_CFG); - lut_base = regs + DISP_GAMMA_LUT; - lut = (struct drm_color_lut *)state->gamma_lut->data; - for (i = 0; i < MTK_LUT_SIZE; i++) { - - if (!lut_diff || (i % 2 == 0)) { - word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << 20) + - (((lut[i].green >> 6) & LUT_10BIT_MASK) << 10) + - ((lut[i].blue >> 6) & LUT_10BIT_MASK); - } else { - diff[0] = (lut[i].red >> 6) - (lut[i - 1].red >> 6); - diff[1] = (lut[i].green >> 6) - (lut[i - 1].green >> 6); - diff[2] = (lut[i].blue >> 6) - (lut[i - 1].blue >> 6); - - word = ((diff[0] & LUT_10BIT_MASK) << 20) + - ((diff[1] & LUT_10BIT_MASK) << 10) + - (diff[2] & LUT_10BIT_MASK); - } - writel(word, (lut_base + i * 4)); + reg = readl(regs + DISP_GAMMA_CFG); + reg = reg | GAMMA_LUT_EN; + writel(reg, regs + DISP_GAMMA_CFG); + lut_base = regs + DISP_GAMMA_LUT; + lut = (struct drm_color_lut *)state->gamma_lut->data; + for (i = 0; i < MTK_LUT_SIZE; i++) { + if (!lut_diff || (i % 2 == 0)) { + word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << 20) + + (((lut[i].green >> 6) & LUT_10BIT_MASK) << 10) + + ((lut[i].blue >> 6) & LUT_10BIT_MASK); + } else { + diff[0] = (lut[i].red >> 6) - (lut[i - 1].red >> 6); + diff[1] = (lut[i].green >> 6) - (lut[i - 1].green >> 6); + diff[2] = (lut[i].blue >> 6) - (lut[i - 1].blue >> 6); + + word = ((diff[0] & LUT_10BIT_MASK) << 20) + + ((diff[1] & LUT_10BIT_MASK) << 10) + + (diff[2] & LUT_10BIT_MASK); } + writel(word, (lut_base + i * 4)); } }