From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E5D152F4948; Mon, 5 May 2025 23:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486956; cv=none; b=DcnegOKyjCM09KtZw/zf0ZP4ZzpoAF69w0Fq+L6DOUaNxR7ScjBBYCGQKD/PHKqCNHEOcOreFSphQDOo1jnE7Cvcir6ZwsmmQdfdxibqwdOhf48tXY0F9NLFuJqAdsceExba9r1DNBRo+g5zbr1oRqJ5ixoiA/H3fKxQIbqabF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486956; c=relaxed/simple; bh=n+WcpgTdYvcRSBPw43R7b05A4ZbCqYfL3djMTnnT/Iw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JejppUuVUBqt7/Ci9Bw8+R7q3PTBtLDTQIvPWL2WbSKGuiFjpLedCvyeed8uJHL8eUSTwavurHBSLD/1MPz+dh6wPNuQ2iZiaJoaM3vkgFSxWJoqBn7LZzqL5GMa19rp1KmUcQfEjiL2EzSKqzfZzjgrRVz3vE7Y2iOmgzjtIqg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MG72koGQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MG72koGQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 787C2C4CEED; Mon, 5 May 2025 23:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486954; bh=n+WcpgTdYvcRSBPw43R7b05A4ZbCqYfL3djMTnnT/Iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MG72koGQ6SowhUfTjvfvDvmsNDl6gIZMUuWQYMt2Hk9UEyZqsqF8xIjATFv1WKjLO hoNMPInDVA4AFuo6e1Il8AOSSYxdSNKjGgws2YfpvH3UFWN6YRVWaonSYoRvwa36D8 V4vwRgxvMv/2VsTB15yAJLDKwKXKDDMAj4nESHhS2zNLFmTUGsfCjOlhnAnvO4wV8K iwmdg6/F1NxSQS+m2hK2qBMXL33k6TVZeXrMPB+vEzp7KkBYoTUxOnfP6VyNjvwRD1 k1NOsOHMO6Dlehj30xHK7xVgv0nd1RiHkz/3wEFdEVFB6+9gpCyWG4MRhhmrthM0Fs /A/T+P4Qzx5Hw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: AngeloGioacchino Del Regno , CK Hu , Chun-Kuang Hu , Sasha Levin , p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, matthias.bgg@gmail.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 077/153] drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence Date: Mon, 5 May 2025 19:12:04 -0400 Message-Id: <20250505231320.2695319-77-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231320.2695319-1-sashal@kernel.org> References: <20250505231320.2695319-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.181 Content-Transfer-Encoding: 8bit From: AngeloGioacchino Del Regno [ Upstream commit 8c9da7cd0bbcc90ab444454fecf535320456a312 ] In preparation for adding support for newer DPI instances which do support direct-pin but do not have any H_FRE_CON register, like the one found in MT8195 and MT8188, add a branch to check if the reg_h_fre_con variable was declared in the mtk_dpi_conf structure for the probed SoC DPI version. As a note, this is useful specifically only for cases in which the support_direct_pin variable is true, so mt8195-dpintf is not affected by any issue. Reviewed-by: CK Hu Signed-off-by: AngeloGioacchino Del Regno Link: https://patchwork.kernel.org/project/dri-devel/patch/20250217154836.108895-6-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_dpi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 9518672dc21b3..3f39109b69154 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -346,12 +346,13 @@ static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, bool enable) static void mtk_dpi_config_2n_h_fre(struct mtk_dpi *dpi) { - mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, H_FRE_2N, H_FRE_2N); + if (dpi->conf->reg_h_fre_con) + mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, H_FRE_2N, H_FRE_2N); } static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi) { - if (dpi->conf->edge_sel_en) + if (dpi->conf->edge_sel_en && dpi->conf->reg_h_fre_con) mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, 0, EDGE_SEL_EN); } -- 2.39.5