From nobody Fri Sep 20 04:02:35 2024 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 44E5F1BC43 for ; Thu, 15 Feb 2024 08:53:32 +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=1707987213; cv=none; b=W59Ijj3gIKwaXJ+CP34fmbR6AL2DTDYeF/tfd1Zop2hOnAJQfswnpvzPFk7N2RTZvhBpjHd9pW4PzptYLETZOzGzWZ9NaClRgUfA4OVlhLvC+2CIdvw9PZEKqvE1Fd+b8LtHJNgPaioOqNKEVTESFtAA48ZTup8HnhdBcHXXCtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707987213; c=relaxed/simple; bh=t314JYLEkG/5o9HpK7I9qR3Mx0x17vEhEBxIxc/bWK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G7RWePK++5ETYumQCuy6mi68CbDn+Rfpu46Fc68eaxQbWiV7vrxPTK7OVkKNvrGdpGEfLLn3gzJjGk76NJHV4nyrz/tdEcGE1pn9iOPPhzHqUXtHzmEqiKYkn7TMrCAcOOm96uyAz9IviZdvv6/6VHxE/JuQdrusqexqyQwkJo8= 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=3XjlyJNq; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="3XjlyJNq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1707987210; bh=t314JYLEkG/5o9HpK7I9qR3Mx0x17vEhEBxIxc/bWK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=3XjlyJNqqrkhFH0s5u8O4UvGyNRs0YdhfTHjRJpQUdbyWX5pwegaSJ453ttZbh81+ TRoVlGcTFK4juZxrtVsZc/5sTvpkaJNyLyAsDFt3VN7IrUJ1rUbptgKmmPi/mnNyRI YXQ4nP/8pWmGnA7tt+oearOXWiCUR3zb8c21xnJBgHeEKPxclr9zDrPiw/ugF2mVOX 6xOKsO3lzH44FyDULJ7X2LP5PATGjd2/27lXcIi/RpkUZBAhf+KNjwnnLlOV3zFlru 68Hf2EPnZSPjb/3ZewUgB7SvqBN/A2SHIPzfFX2QEYieFEoMET+1wNI19Mi2Anplmz OwB+qC747Xp6w== 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 E77B137820AD; Thu, 15 Feb 2024 08:53:29 +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, Alexandre Mergnat Subject: [PATCH v6 9/9] drm/mediatek: dsi: Use mipi_dsi_pixel_format_to_bpp() helper function Date: Thu, 15 Feb 2024 09:53:16 +0100 Message-ID: <20240215085316.56835-10-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215085316.56835-1-angelogioacchino.delregno@collabora.com> References: <20240215085316.56835-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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Alexandre Mergnat Signed-off-by: AngeloGioacchino Del Regno --- 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 b644505de98a..9501f4019199 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 !=3D 1) return 0; =20 - switch (dsi->format) { - case MIPI_DSI_FMT_RGB565: - bit_per_pixel =3D 16; - break; - case MIPI_DSI_FMT_RGB666_PACKED: - bit_per_pixel =3D 18; - break; - case MIPI_DSI_FMT_RGB666: - case MIPI_DSI_FMT_RGB888: - default: - bit_per_pixel =3D 24; - break; + ret =3D 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 =3D ret; =20 dsi->data_rate =3D 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 =3D bridge_to_dsi(bridge); - u32 bpp; + int bpp; =20 - if (dsi->format =3D=3D MIPI_DSI_FMT_RGB565) - bpp =3D 16; - else - bpp =3D 24; + bpp =3D mipi_dsi_pixel_format_to_bpp(dsi->format); + if (bpp < 0) + return MODE_ERROR; =20 if (mode->clock * bpp / dsi->lanes > 1500000) return MODE_CLOCK_HIGH; --=20 2.43.0