| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <d59c3b6a965daf22750be79b0f74703c216ec44a.camel@mediatek.com>
Date: Mon, 23 Sep 2024 03:51:26 +0000
From: CK Hu (胡俊光) <ck.hu@...iatek.com>
To: Jason-JH Lin (林睿祥) <Jason-JH.Lin@...iatek.com>,
"alpernebiyasak@...il.com" <alpernebiyasak@...il.com>,
"chunkuang.hu@...nel.org" <chunkuang.hu@...nel.org>, "AngeloGioacchino Del
Regno" <angelogioacchino.delregno@...labora.com>
CC: "linux-mediatek@...ts.infradead.org" <linux-mediatek@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Singo Chang (張興國) <Singo.Chang@...iatek.com>,
Shawn Sung (宋孝謙) <Shawn.Sung@...iatek.com>,
Nancy Lin (林欣螢) <Nancy.Lin@...iatek.com>,
"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
Project_Global_Chrome_Upstream_Group
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
"linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH v3] drm/mediatek: ovl: Add fmt_convert function pointer to
driver data
Hi, Jason:
On Wed, 2024-09-18 at 00:44 +0800, Jason-JH.Lin wrote:
> OVL_CON_CLRFMT_MAN is a configuration for extending color format
> settings of DISP_REG_OVL_CON(n).
> It will change some of the original color format settings.
>
> Take the settings of (3 << 12) for example.
> - If OVL_CON_CLRFMT_MAN = 0 means OVL_CON_CLRFMT_RGBA8888.
> - If OVL_CON_CLRFMT_MAN = 1 means OVL_CON_CLRFMT_PARGB8888.
>
> Since OVL_CON_CLRFMT_MAN is not supported on previous SoCs,
> It breaks the OVL color format setting of MT8173.
>
> Therefore, the fmt_convert function pointer is added to the driver data
> and mtk_ovl_fmt_convert_with_blend is implemented for MT8192 and MT8195
> that support OVL_CON_CLRFMT_MAN, and mtk_ovl_fmt_convert is implemented
> for other SoCs that do not support it to solve the degradation problem.
>
> Fixes: a3f7f7ef4bfe ("drm/mediatek: Support "Pre-multiplied" blending in OVL")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@...iatek.com>
> Tested-by: Alper Nebi Yasak <alpernebiyasak@...il.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 63 ++++++++++++++++++++++---
> 1 file changed, 56 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 89b439dcf3a6..4948f269fb81 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -143,6 +143,7 @@ struct mtk_disp_ovl_data {
> unsigned int addr;
> unsigned int gmc_bits;
> unsigned int layer_nr;
> + unsigned int (*fmt_convert)(struct device *dev, struct mtk_plane_state *state);
> bool fmt_rgb565_is_0;
> bool smi_id_en;
> bool supports_afbc;
> @@ -386,13 +387,54 @@ void mtk_ovl_layer_off(struct device *dev, unsigned int idx,
> DISP_REG_OVL_RDMA_CTRL(idx));
> }
>
> -static unsigned int ovl_fmt_convert(struct mtk_disp_ovl *ovl, unsigned int fmt,
> - unsigned int blend_mode)
> +static unsigned int mtk_ovl_fmt_convert(struct device *dev, struct mtk_plane_state *state)
> {
> - /* The return value in switch "MEM_MODE_INPUT_FORMAT_XXX"
> - * is defined in mediatek HW data sheet.
> - * The alphabet order in XXX is no relation to data
> - * arrangement in memory.
> + struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> + unsigned int fmt = state->pending.format;
> +
> + switch (fmt) {
> + default:
> + case DRM_FORMAT_RGB565:
> + return OVL_CON_CLRFMT_RGB565(ovl);
> + case DRM_FORMAT_BGR565:
> + return OVL_CON_CLRFMT_RGB565(ovl) | OVL_CON_BYTE_SWAP;
> + case DRM_FORMAT_RGB888:
> + return OVL_CON_CLRFMT_RGB888(ovl);
> + case DRM_FORMAT_BGR888:
> + return OVL_CON_CLRFMT_RGB888(ovl) | OVL_CON_BYTE_SWAP;
> + case DRM_FORMAT_RGBX8888:
> + case DRM_FORMAT_RGBA8888:
> + case DRM_FORMAT_RGBX1010102:
> + case DRM_FORMAT_RGBA1010102:
> + return OVL_CON_CLRFMT_RGBA8888;
Comparing mtk_ovl_fmt_convert() with mtk_ovl_fmt_convert_with_blend(), some pixel formats are supported, such as BGRA8888.
But in kernel v6.10, these formats are supported.
Is the code wrong in v6.10?
Regards,
CK
> + case DRM_FORMAT_XRGB8888:
> + case DRM_FORMAT_ARGB8888:
> + case DRM_FORMAT_XRGB2101010:
> + case DRM_FORMAT_ARGB2101010:
> + return OVL_CON_CLRFMT_ARGB8888;
> + case DRM_FORMAT_XBGR8888:
> + case DRM_FORMAT_ABGR8888:
> + case DRM_FORMAT_XBGR2101010:
> + case DRM_FORMAT_ABGR2101010:
> + return OVL_CON_CLRFMT_ABGR8888;
> + case DRM_FORMAT_UYVY:
> + return OVL_CON_CLRFMT_UYVY | OVL_CON_MTX_YUV_TO_RGB;
> + case DRM_FORMAT_YUYV:
> + return OVL_CON_CLRFMT_YUYV | OVL_CON_MTX_YUV_TO_RGB;
> + }
> +}
> +
> +static unsigned int mtk_ovl_fmt_convert_with_blend(struct device *dev,
> + struct mtk_plane_state *state)
> +{
> + struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> + unsigned int fmt = state->pending.format;
> + unsigned int blend_mode = state->base.pixel_blend_mode;
> +
> + /*
> + * For the platforms where OVL_CON_CLRFMT_MAN is defined in the
> + * hardware data sheet and supports premultiplied color formats
> + * such as OVL_CON_CLRFMT_PRGB8888.
> */
> switch (fmt) {
> default:
> @@ -471,7 +513,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
> return;
> }
>
> - con = ovl_fmt_convert(ovl, fmt, blend_mode);
> + con = ovl->data->fmt_convert(dev, state);
> if (state->base.fb) {
> con |= OVL_CON_AEN;
> con |= state->base.alpha & OVL_CON_ALPHA;
> @@ -625,6 +667,7 @@ static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT2701,
> .gmc_bits = 8,
> .layer_nr = 4,
> + .fmt_convert = mtk_ovl_fmt_convert,
> .fmt_rgb565_is_0 = false,
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> @@ -634,6 +677,7 @@ static const struct mtk_disp_ovl_data mt8173_ovl_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 8,
> .layer_nr = 4,
> + .fmt_convert = mtk_ovl_fmt_convert,
> .fmt_rgb565_is_0 = true,
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> @@ -643,6 +687,7 @@ static const struct mtk_disp_ovl_data mt8183_ovl_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 10,
> .layer_nr = 4,
> + .fmt_convert = mtk_ovl_fmt_convert,
> .fmt_rgb565_is_0 = true,
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> @@ -652,6 +697,7 @@ static const struct mtk_disp_ovl_data mt8183_ovl_2l_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 10,
> .layer_nr = 2,
> + .fmt_convert = mtk_ovl_fmt_convert,
> .fmt_rgb565_is_0 = true,
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> @@ -661,6 +707,7 @@ static const struct mtk_disp_ovl_data mt8192_ovl_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 10,
> .layer_nr = 4,
> + .fmt_convert = mtk_ovl_fmt_convert_with_blend,
> .fmt_rgb565_is_0 = true,
> .smi_id_en = true,
> .formats = mt8173_formats,
> @@ -671,6 +718,7 @@ static const struct mtk_disp_ovl_data mt8192_ovl_2l_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 10,
> .layer_nr = 2,
> + .fmt_convert = mtk_ovl_fmt_convert_with_blend,
> .fmt_rgb565_is_0 = true,
> .smi_id_en = true,
> .formats = mt8173_formats,
> @@ -681,6 +729,7 @@ static const struct mtk_disp_ovl_data mt8195_ovl_driver_data = {
> .addr = DISP_REG_OVL_ADDR_MT8173,
> .gmc_bits = 10,
> .layer_nr = 4,
> + .fmt_convert = mtk_ovl_fmt_convert_with_blend,
> .fmt_rgb565_is_0 = true,
> .smi_id_en = true,
> .supports_afbc = true,
Powered by blists - more mailing lists