From patchwork Wed Dec 20 13:57:19 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: 181647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2651372dyi; Wed, 20 Dec 2023 05:58:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGKOoOUpQXOPztAD1xMO4lp8RADpeUfeQUlikBW0Z8I8gE12YCCE7S88OCcXGFII38GmRUp X-Received: by 2002:a17:907:7246:b0:a26:9977:e328 with SMTP id ds6-20020a170907724600b00a269977e328mr369729ejc.17.1703080687650; Wed, 20 Dec 2023 05:58:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703080687; cv=none; d=google.com; s=arc-20160816; b=c+4Dm3tTRXlWhlmb8t6htmUqWk0eubwPsmQGkT9oeEFakD9ZksY1E3XtAm1lsf7pra r/efTEc1Q8FV4MwOYLZ4I26vSUOgbK6sIawDwNiekooHdSmqMSrybq4N8M34MZG0xDoZ r18c3mFAxJ1Lh7QegWZePm95iQwm4JZDbHWnb8hraOQnIX4PF5BoZWQgp4sGq+jxpZqC rLq7clcF4eCRsMKChkUnTm0ZVuiXfjx80bQuGNlj3SqOFOrlPjBGzE7xu+peW1+0MRp7 FAO8fpWBfYOInKD4eFvNlyAxfv3uQ/KG2FMEjWL/Z6iUHn8VknCwur4fttaIky3kyd5q D8AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=R+4Q5d/ug7LKqVW75d4eR6nPCl8eO0AWhpB382kheLM=; fh=IVEuUW294+VsYqntuuf+zjxSPCAy3JCdiDbkzxcbChQ=; b=e3W1JUSgg+eQ7LMNiKdnGxpbCrFYIpbIhu9Jm75YjNEYuxeEq/7202SKtFEzmYY2kJ s/unp3job69iW2BgICOCzyI/Zv3Z/UNqmxo4yZjcTaT3JL/kcSOBO0EqLwnldeivG/zl 5mSnxzrlTK2szElYNPo6icPasB80kGpqPyuYuT0b0G7N4PKbz27wHicYclPf2uJd9nu3 DUIn+Ux3oCj0B23r1oaB4Qa2HTk/mv68wnzeNoDAk/ht8PkxRJ6YK34j7KVHidRGOzkJ g2kVAycp3AMfS7PcBaW9isM5+++EHSvEuBANqDvPKoF9s5iAMsUSE89JkaQGKffrqSMF 5W1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=kF1ruH8O; spf=pass (google.com: domain of linux-kernel+bounces-7001-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7001-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id gx25-20020a170906f1d900b00a23499a71a4si3228976ejb.525.2023.12.20.05.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 05:58:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7001-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=kF1ruH8O; spf=pass (google.com: domain of linux-kernel+bounces-7001-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7001-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3D8691F21E04 for ; Wed, 20 Dec 2023 13:58:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0253038FAC; Wed, 20 Dec 2023 13:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="kF1ruH8O" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D07B374DD for ; Wed, 20 Dec 2023 13:57:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1703080651; bh=k61tRW8yS3BzK3cMQHtq3EYuHMcvpO3gN4VZxttnP+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kF1ruH8OAxpExyp0Sv2u12sxLq7V3qoO02wqahBDtB/gAW/Uz26tJTPJMV6smd53T kGTFVLTatFK+iURZlMw743w2NcYo0ZKh8UPwrU63oy4eo8IwIaMDPbPXWHHZo1X0JD AuUcvC71piNh/J/Bqf791Efr99N1MAJ8AA6tLSPkDLSmDFnPjaAYuKV/i6XaN3Mdj7 Tyx36DLaNcyMeWetrnbfjXnnZ1cxwmx6Ee4Yz3NYwmPiV/FRILhZ3r89nAl4fLeRpJ AKwYH5NvBe/u15mGIJgcyxeXEwfnhIfERyf0vKGlL0tM+kBJS/7Iet+zreA4o1xWxn 51nPoIEhlvceA== Received: from IcarusMOD.eternityproject.eu (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id E1A113781FCE; Wed, 20 Dec 2023 13:57:30 +0000 (UTC) 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, kernel@collabora.com Subject: [PATCH v2 1/4] drm/mediatek: dsi: Use GENMASK() for register mask definitions Date: Wed, 20 Dec 2023 14:57:19 +0100 Message-ID: <20231220135722.192080-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231220135722.192080-1-angelogioacchino.delregno@collabora.com> References: <20231220135722.192080-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785809535152174937 X-GMAIL-MSGID: 1785809535152174937 Change magic numerical masks with usage of the GENMASK() macro to improve readability. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_dsi.c | 46 ++++++++++++++++-------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index a2fdfc8ddb15..23d2c5be8dbb 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -58,18 +58,18 @@ #define DSI_TXRX_CTRL 0x18 #define VC_NUM BIT(1) -#define LANE_NUM (0xf << 2) +#define LANE_NUM GENMASK(5, 2) #define DIS_EOT BIT(6) #define NULL_EN BIT(7) #define TE_FREERUN BIT(8) #define EXT_TE_EN BIT(9) #define EXT_TE_EDGE BIT(10) -#define MAX_RTN_SIZE (0xf << 12) +#define MAX_RTN_SIZE GENMASK(15, 12) #define HSTX_CKLP_EN BIT(16) #define DSI_PSCTRL 0x1c -#define DSI_PS_WC 0x3fff -#define DSI_PS_SEL (3 << 16) +#define DSI_PS_WC GENMASK(14, 0) +#define DSI_PS_SEL GENMASK(19, 16) #define PACKED_PS_16BIT_RGB565 (0 << 16) #define LOOSELY_PS_18BIT_RGB666 (1 << 16) #define PACKED_PS_18BIT_RGB666 (2 << 16) @@ -109,26 +109,27 @@ #define LD0_WAKEUP_EN BIT(2) #define DSI_PHY_TIMECON0 0x110 -#define LPX (0xff << 0) -#define HS_PREP (0xff << 8) -#define HS_ZERO (0xff << 16) -#define HS_TRAIL (0xff << 24) +#define LPX GENMASK(7, 0) +#define HS_PREP GENMASK(15, 8) +#define HS_ZERO GENMASK(23, 16) +#define HS_TRAIL GENMASK(31, 24) #define DSI_PHY_TIMECON1 0x114 -#define TA_GO (0xff << 0) -#define TA_SURE (0xff << 8) -#define TA_GET (0xff << 16) -#define DA_HS_EXIT (0xff << 24) +#define TA_GO GENMASK(7, 0) +#define TA_SURE GENMASK(15, 8) +#define TA_GET GENMASK(23, 16) +#define DA_HS_EXIT GENMASK(31, 24) #define DSI_PHY_TIMECON2 0x118 -#define CONT_DET (0xff << 0) -#define CLK_ZERO (0xff << 16) -#define CLK_TRAIL (0xff << 24) +#define CONT_DET GENMASK(7, 0) +#define DA_HS_SYNC GENMASK(15, 8) +#define CLK_ZERO GENMASK(23, 16) +#define CLK_TRAIL GENMASK(31, 24) #define DSI_PHY_TIMECON3 0x11c -#define CLK_HS_PREP (0xff << 0) -#define CLK_HS_POST (0xff << 8) -#define CLK_HS_EXIT (0xff << 16) +#define CLK_HS_PREP GENMASK(7, 0) +#define CLK_HS_POST GENMASK(15, 8) +#define CLK_HS_EXIT GENMASK(23, 16) #define DSI_VM_CMD_CON 0x130 #define VM_CMD_EN BIT(0) @@ -138,13 +139,14 @@ #define FORCE_COMMIT BIT(0) #define BYPASS_SHADOW BIT(1) -#define CONFIG (0xff << 0) +/* CMDQ related bits */ +#define CONFIG GENMASK(7, 0) #define SHORT_PACKET 0 #define LONG_PACKET 2 #define BTA BIT(2) -#define DATA_ID (0xff << 8) -#define DATA_0 (0xff << 16) -#define DATA_1 (0xff << 24) +#define DATA_ID GENMASK(15, 8) +#define DATA_0 GENMASK(23, 16) +#define DATA_1 GENMASK(31, 24) #define NS_TO_CYCLE(n, c) ((n) / (c) + (((n) % (c)) ? 1 : 0))