From patchwork Tue Feb 6 12:07:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 197391 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1497176dyb; Tue, 6 Feb 2024 04:19:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuOjQR+ALGez60Fum/Nc3T7YmzKI8JoJLFhJndWXVE/6b27V9BitVIGc58xWV0US21dD1F X-Received: by 2002:a05:6871:4582:b0:1fb:23:6feb with SMTP id nl2-20020a056871458200b001fb00236febmr2852266oab.39.1707221974365; Tue, 06 Feb 2024 04:19:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707221974; cv=pass; d=google.com; s=arc-20160816; b=v+PyHso9VRpztv/I+tUdU+VW7XTIhTfOAnGnSP8rSmOR5z2l/v8WUoG8QdpgCTNIJ0 J1iI0QlloS9/gscmnmNt/RG586ad9zonLf/74K6n9yjsirCLj89ycllTepoE2QU7xFkD CkKQ/X71ppsuvxoJ3a6G2XuKUngMOKKCYTtItRv90bbu6ML2565Owrh8LOu1q0RjHa3G WsZNbvIXWIfyyKsQ5wukVJ6vcTpJf9BTMFzNoEyWkHvcZtKElcqCijTBVw7avO6Yoy0y kF7O4VXyV1ZoHZqNK82UzVWyyi9wcBbwurjad5Nd3+hyPxRje80r7nw8aVJ+MPeVaeA/ dJYA== ARC-Message-Signature: i=2; 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=D2Wkj5C546fpT8jt76En1QyD6W14LyKR7LAOg34wM3A=; fh=jRKeuBSwy7uWoCjTAGNcPacwzdXRirLs9vPgpAx6Z7E=; b=Nozp/0EN7Uh2/XRqIKazXLyv+wJ9qOH6K2iQWEc4Y7xwUtuznbTdsxv0CH2jEAfu7b 9DrAiFemebrzxA44huHQRC0flR1rWJOAhcgx8OXyoWjOKl7pODvVj+2k/ElaieSODY0S Wr9IfH1QpFN/z2eZUOdAdPVPsPwMvcRA4z94hLyKcXvxWnisHjZbnlS4gEVLcSMsV5AY 38CPfSLmSrv5ghXzlpTyh1HJ/bAXFl+f0+dysLc1YPMqLm1cz05TGe9ycXVAK7SqDBL7 rmQuDVZjrrRsQ7VWla1rIT7Q9/eziwUbGKDYJLT6puIpFLX443TkFCqJiJ0Y70aJ3N87 eNdg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=ovKTn1GK; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-54866-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54866-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com X-Forwarded-Encrypted: i=1; AJvYcCV6PWgcAz8Fwa6+x+DV36vZap76bQ19R1/lcNo9fP/inHHTyD/lBtvrf0PP1npHA3OqidNI9S0TzKZCwcKPPwuecXX9lg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e185-20020a6369c2000000b005d8bc09efbdsi1615961pgc.881.2024.02.06.04.19.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 04:19:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54866-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=ovKTn1GK; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-54866-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54866-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id BB747B25B7D for ; Tue, 6 Feb 2024 12:12:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 232A212FF72; Tue, 6 Feb 2024 12:08:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ovKTn1GK" 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 ADAC8130AE9 for ; Tue, 6 Feb 2024 12:08:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221292; cv=none; b=WQjcXqEUAnvtBtfPnu6crIWmW/XkpovqRuKKwgwCoMkyAGxesEWerorxMpCaevCZZwoibEfFV2qt5CwE7izemjt8TQeKxTW8aNJH+Tws+uG1mCBcrCk2xrdmdo2IojGGXTOE5cMB/3qHHJCaVKiq7pH3LmTbEoNi0K2Opw5/HqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221292; c=relaxed/simple; bh=VDX7AhydHRhOSNhBFLKBelqucKRnbrmvRDj7DrUlgD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U31a/qfg0OjZSztT/PKVBxGCbSQoiAhuhxShr8yu2/kyF4fhA9stmUTKVsjUecEbFPomAV8aYrKeHgGORR1T7hZs2/3vVJod7F/yS8bbL6L/K8QHfGyXgfwTnMRGBOwpgM0oasGAsF86+yCvTHCUajFI2pTIaPo2hTCmzMuHz8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ovKTn1GK; arc=none smtp.client-ip=46.235.227.194 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=1707221281; bh=VDX7AhydHRhOSNhBFLKBelqucKRnbrmvRDj7DrUlgD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovKTn1GKOsdkDSM+//FcNhut09sz3Y7AB4VMOlss3fZuDyOJlgSLR7BO0W31sAuaf /HRQf1sKvXb/0Pcgfgz6zPapjGDbA4gAXZjJBe+hBdosMqJ0tXXWwS+olIZ3xvvjqV SiWZ0XcpY+Ekt1+ImYNbsUW8onjPDewkEF4ynIHvpQkIF2TcnkZi/aZW3UeFS1cOa/ L2r7FSNTkn5WG+8jiPanSXTWS5VuHkQSa7x2MkkjjFunxk0vtqBOYo7924Ec2G89kQ 7/5rmw0XDsx0vphhDY+9ybiU8fk2A1esKbiB6EQu7IFrvNADy1XmqvdUNLLtJHzKIW myMD7PJXK4bow== 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 DEAB63781F8E; Tue, 6 Feb 2024 12:08:00 +0000 (UTC) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: fshao@chromium.org, 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 v4 9/9] drm/mediatek: dsi: Use mipi_dsi_pixel_format_to_bpp() helper function Date: Tue, 6 Feb 2024 13:07:48 +0100 Message-ID: <20240206120748.136610-10-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206120748.136610-1-angelogioacchino.delregno@collabora.com> References: <20240206120748.136610-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: 1790151989022585811 X-GMAIL-MSGID: 1790151989022585811 Instead of open coding, use the mipi_dsi_pixel_format_to_bpp() helper function from drm_mipi_dsi.h in mtk_dsi_poweron() and for validation in mtk_dsi_bridge_mode_valid(). Note that this function changes the behavior of this driver: previously, in case of unknown formats, it would (wrongly) assume that it should account for a 24-bits format - now it will return an error and refuse to set clocks and/or enable the DSI. This is done because setting the wrong data rate will only produce a garbage output that the display will misinterpret both because this driver doesn't actually provide any extra-spec format support and/or because the data rate (hence, the HS clock) will be wrong. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Alexandre Mergnat --- drivers/gpu/drm/mediatek/mtk_dsi.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 545c5cc071d9..d844a0500e2b 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -598,19 +598,12 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) if (++dsi->refcount != 1) return 0; - switch (dsi->format) { - case MIPI_DSI_FMT_RGB565: - bit_per_pixel = 16; - break; - case MIPI_DSI_FMT_RGB666_PACKED: - bit_per_pixel = 18; - break; - case MIPI_DSI_FMT_RGB666: - case MIPI_DSI_FMT_RGB888: - default: - bit_per_pixel = 24; - break; + ret = mipi_dsi_pixel_format_to_bpp(dsi->format); + if (ret < 0) { + dev_err(dev, "Unknown MIPI DSI format %d\n", dsi->format); + return ret; } + bit_per_pixel = ret; dsi->data_rate = DIV_ROUND_UP_ULL(dsi->vm.pixelclock * bit_per_pixel, dsi->lanes); @@ -793,12 +786,11 @@ mtk_dsi_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_mode *mode) { struct mtk_dsi *dsi = bridge_to_dsi(bridge); - u32 bpp; + int bpp; - if (dsi->format == MIPI_DSI_FMT_RGB565) - bpp = 16; - else - bpp = 24; + bpp = mipi_dsi_pixel_format_to_bpp(dsi->format); + if (bpp < 0) + return MODE_ERROR; if (mode->clock * bpp / dsi->lanes > 1500000) return MODE_CLOCK_HIGH;