From patchwork Wed Oct 25 10:49:40 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: 158026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2508630vqx; Wed, 25 Oct 2023 03:49:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2IYn1HiTTRYjWj2XdwyET0PxDAAQ7P0eO3U5VRa0lcRv0T8avyKIcl33Q/6E5DqSnkfQi X-Received: by 2002:a0d:db43:0:b0:5a7:baae:329f with SMTP id d64-20020a0ddb43000000b005a7baae329fmr14449794ywe.15.1698230995150; Wed, 25 Oct 2023 03:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698230995; cv=none; d=google.com; s=arc-20160816; b=PFKof/krasOS0MxnyEsgPfd4dHHie0cHreu2AvkPPq/2nfN5qGHqQwxm4BgHrZn/FQ bHIJJux6Q8gg3C0dOUmi2gIec8ROQRhW45W3tXhkhhMIZhKtCtMhTgM1yxu1V1Vm9ZD8 xt/6J4EixwjyHXpTueg3umT8Ob7UuRjLXFVz4Kx4If8/HW5ZlP0PUiLq2OPaa19VZIFJ pYhopg80+QZ0meFFYb6tn/qAWnIuSDNidsO2CHHY4zsxRgZk2NQoPqUWL2pQSY7RylDB DTDsgYqwsd49BRG/93q9KsaGMYvxFYMEq1gd1AjPpe9BclQzn5Xyn6XFAh24cGmBO0nQ LBdA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=dDSYRXKFo9Q8DK6w8Xqr/McePTA17zRpRnPw6IcBodY=; fh=PrbqFa1CXOv5HqFj4txvxLUhts8W1/Qsov4L0vVsOUY=; b=tOs09YHbVXcIo3LxvCYOYpUPQqf4YaVejInQ6MXcF4lYRlq96RFjPq2K4qT2z1Qg7c WtiMFRP0qXGwez01okxcyRu607qQUrQKDLsUHQoASuSxwG0MJzkC7eTqpHDAj+O21vlk kD9xncVUnDVXW7MskVaziAiiFdMxjv+t4Ebm9YhQAINTehMsYILj2Mfqa+8cjiPk4YGc +BgqgR6bYFveKZ6WA/LggN3BmtsSkizqU8xf801q9sxTUckQMoWX+kwpPXuxKqDEqjT9 aLLwE4eo1ctuLTzyZz9Hef3FXfKJdXU4KEqslVvNmgXePcc6E6GMIgjUpsJtAn8kC5SK uIgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="XMHQ/lu2"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id y125-20020a81a183000000b0059bce05d922si10685528ywg.84.2023.10.25.03.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 03:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="XMHQ/lu2"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0765080E73C4; Wed, 25 Oct 2023 03:49:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233435AbjJYKtv (ORCPT + 26 others); Wed, 25 Oct 2023 06:49:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232076AbjJYKtt (ORCPT ); Wed, 25 Oct 2023 06:49:49 -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 A168BBB for ; Wed, 25 Oct 2023 03:49:46 -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 ADE27660731F; Wed, 25 Oct 2023 11:49:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698230985; bh=9Tz11dV1gF0knOECb4CmRHRhrmCR7btgyLRsf9oipxs=; h=From:To:Cc:Subject:Date:From; b=XMHQ/lu2klLU+B4oEWjXysMybAukvNjzrEsnN9hr53/HTq1YluCERrAL2wjoeNi74 l+FI7+M9qp+Fk3wBaZYqgI0JdLG0ZKj5hDYGBSYITpDGD6z2ILDTH/ERfv8lh++DUd evnPHO/MQhGpG2xJUOz/SKqre0ZipRzs5IXbbhPdx72nKGsfv5B9xDka9LjM7ZLEcm WgB/7Hw44JxYkEhHvaulUumQl3tCmQqduHEbWjy8hgqSf84Flsj5warXCP31p63nq5 M7zPPqiCAgwQshKuzoJ0I8RbMWEtUsKFUrTBXSJamJnGftGE2U9eccewFQYKfmkOAH 14SkEm/DXGrAg== 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, ck.hu@mediatek.com, nfraprado@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com Subject: [PATCH] drm: mediatek: mtk_disp_gamma: Fix breakage due to merge issue Date: Wed, 25 Oct 2023 12:49:40 +0200 Message-ID: <20231025104940.140605-1-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.42.0 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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 03:49:54 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780724263845649693 X-GMAIL-MSGID: 1780724263845649693 While the commit that was sent to the mailing lists was fine, something happened during merge and the mtk_gamma_set() function got broken as a writel() was turned into a readl(). Fix that by changing that back to the expected writel(). Fixes: a6b39cd248f3 ("drm/mediatek: De-commonize disp_aal/disp_gamma gamma_set functions") Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index 2fada9d6c95f..52c752bc5f41 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -203,7 +203,7 @@ void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) /* Disable RELAY mode to pass the processed image */ cfg_val &= ~GAMMA_RELAY_MODE; - cfg_val = readl(gamma->regs + DISP_GAMMA_CFG); + writel(cfg_val, gamma->regs + DISP_GAMMA_CFG); } void mtk_gamma_config(struct device *dev, unsigned int w,