From: Matthias Brugger <matthias.bgg@gmail.com>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
linux-kernel@vger.kernel.org
Cc: Collabora Kernel ML <kernel@collabora.com>,
yongqiang.niu@mediatek.com, drinkcat@chromium.org,
hsinyi@chromium.org, chunkuang.hu@kernel.org,
CK Hu <ck.hu@mediatek.com>, Daniel Vetter <daniel@ffwll.ch>,
David Airlie <airlied@linux.ie>,
Philipp Zabel <p.zabel@pengutronix.de>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 1/4] soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h
Date: Sat, 28 Nov 2020 00:35:17 +0100 [thread overview]
Message-ID: <5b6816ca-f3c9-3048-57ca-f6af128fbb0b@gmail.com> (raw)
In-Reply-To: <20201006193320.405529-2-enric.balletbo@collabora.com>
On 06/10/2020 21:33, Enric Balletbo i Serra wrote:
> From: Yongqiang Niu <yongqiang.niu@mediatek.com>
>
> MMSYS is the driver which controls the routing of these DDP components,
> so the definition of the mtk_ddp_comp_id enum should be placed in mtk-mmsys.h
>
> Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
> This patch was previously part of another series, but has no
> dependencies and can be applied independently. As the latest version
> sent is from two months ago, I resent this patch because the next patches
> of this series depends on it to apply cleanly.
>
Applied to v5.10-next/soc
Thanks
> [1] https://patchwork.kernel.org/patch/11706243
>
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +--------------------
> drivers/soc/mediatek/mtk-mmsys.c | 4 +--
> include/linux/soc/mediatek/mtk-mmsys.h | 33 ++++++++++++++++++++
> 3 files changed, 35 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index debe36395fe7..161201fe5179 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -7,6 +7,7 @@
> #define MTK_DRM_DDP_COMP_H
>
> #include <linux/io.h>
> +#include <linux/soc/mediatek/mtk-mmsys.h>
>
> struct device;
> struct device_node;
> @@ -35,39 +36,6 @@ enum mtk_ddp_comp_type {
> MTK_DDP_COMP_TYPE_MAX,
> };
>
> -enum mtk_ddp_comp_id {
> - DDP_COMPONENT_AAL0,
> - DDP_COMPONENT_AAL1,
> - DDP_COMPONENT_BLS,
> - DDP_COMPONENT_CCORR,
> - DDP_COMPONENT_COLOR0,
> - DDP_COMPONENT_COLOR1,
> - DDP_COMPONENT_DITHER,
> - DDP_COMPONENT_DPI0,
> - DDP_COMPONENT_DPI1,
> - DDP_COMPONENT_DSI0,
> - DDP_COMPONENT_DSI1,
> - DDP_COMPONENT_DSI2,
> - DDP_COMPONENT_DSI3,
> - DDP_COMPONENT_GAMMA,
> - DDP_COMPONENT_OD0,
> - DDP_COMPONENT_OD1,
> - DDP_COMPONENT_OVL0,
> - DDP_COMPONENT_OVL_2L0,
> - DDP_COMPONENT_OVL_2L1,
> - DDP_COMPONENT_OVL1,
> - DDP_COMPONENT_PWM0,
> - DDP_COMPONENT_PWM1,
> - DDP_COMPONENT_PWM2,
> - DDP_COMPONENT_RDMA0,
> - DDP_COMPONENT_RDMA1,
> - DDP_COMPONENT_RDMA2,
> - DDP_COMPONENT_UFOE,
> - DDP_COMPONENT_WDMA0,
> - DDP_COMPONENT_WDMA1,
> - DDP_COMPONENT_ID_MAX,
> -};
> -
> struct mtk_ddp_comp;
> struct cmdq_pkt;
> struct mtk_ddp_comp_funcs {
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index a55f25511173..36ad66bb221b 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -5,13 +5,11 @@
> */
>
> #include <linux/device.h>
> +#include <linux/io.h>
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/soc/mediatek/mtk-mmsys.h>
>
> -#include "../../gpu/drm/mediatek/mtk_drm_ddp.h"
> -#include "../../gpu/drm/mediatek/mtk_drm_ddp_comp.h"
> -
> #define DISP_REG_CONFIG_DISP_OVL0_MOUT_EN 0x040
> #define DISP_REG_CONFIG_DISP_OVL1_MOUT_EN 0x044
> #define DISP_REG_CONFIG_DISP_OD_MOUT_EN 0x048
> diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h
> index 7bab5d9a3d31..2228bf6133da 100644
> --- a/include/linux/soc/mediatek/mtk-mmsys.h
> +++ b/include/linux/soc/mediatek/mtk-mmsys.h
> @@ -9,6 +9,39 @@
> enum mtk_ddp_comp_id;
> struct device;
>
> +enum mtk_ddp_comp_id {
> + DDP_COMPONENT_AAL0,
> + DDP_COMPONENT_AAL1,
> + DDP_COMPONENT_BLS,
> + DDP_COMPONENT_CCORR,
> + DDP_COMPONENT_COLOR0,
> + DDP_COMPONENT_COLOR1,
> + DDP_COMPONENT_DITHER,
> + DDP_COMPONENT_DPI0,
> + DDP_COMPONENT_DPI1,
> + DDP_COMPONENT_DSI0,
> + DDP_COMPONENT_DSI1,
> + DDP_COMPONENT_DSI2,
> + DDP_COMPONENT_DSI3,
> + DDP_COMPONENT_GAMMA,
> + DDP_COMPONENT_OD0,
> + DDP_COMPONENT_OD1,
> + DDP_COMPONENT_OVL0,
> + DDP_COMPONENT_OVL_2L0,
> + DDP_COMPONENT_OVL_2L1,
> + DDP_COMPONENT_OVL1,
> + DDP_COMPONENT_PWM0,
> + DDP_COMPONENT_PWM1,
> + DDP_COMPONENT_PWM2,
> + DDP_COMPONENT_RDMA0,
> + DDP_COMPONENT_RDMA1,
> + DDP_COMPONENT_RDMA2,
> + DDP_COMPONENT_UFOE,
> + DDP_COMPONENT_WDMA0,
> + DDP_COMPONENT_WDMA1,
> + DDP_COMPONENT_ID_MAX,
> +};
> +
> void mtk_mmsys_ddp_connect(struct device *dev,
> enum mtk_ddp_comp_id cur,
> enum mtk_ddp_comp_id next);
>
next prev parent reply other threads:[~2020-11-27 23:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 19:33 [PATCH 0/4] soc: mediatek: Prepare MMSYS for DDP routing using tables Enric Balletbo i Serra
2020-10-06 19:33 ` [PATCH 1/4] soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h Enric Balletbo i Serra
2020-11-27 23:35 ` Matthias Brugger [this message]
2020-10-06 19:33 ` [PATCH 2/4] soc: mediatek: mmsys: Use devm_platform_ioremap_resource() Enric Balletbo i Serra
2020-10-06 23:21 ` Chun-Kuang Hu
2020-10-07 0:01 ` Chun-Kuang Hu
2020-11-27 23:35 ` Matthias Brugger
2020-10-06 19:33 ` [PATCH 3/4] soc: mediatek: mmsys: Create struct mtk_mmsys to store context data Enric Balletbo i Serra
2020-10-06 23:24 ` Chun-Kuang Hu
2020-10-07 0:00 ` Chun-Kuang Hu
2020-10-06 19:33 ` [PATCH 4/4] soc: mediatek: mmsys: Use an array for setting the routing registers Enric Balletbo i Serra
2020-10-07 0:02 ` Chun-Kuang Hu
2020-10-08 0:01 ` Chun-Kuang Hu
2020-10-08 7:49 ` Enric Balletbo i Serra
2020-10-08 10:53 ` Matthias Brugger
2020-10-08 10:22 ` Matthias Brugger
2020-10-11 2:22 ` Chun-Kuang Hu
2020-10-15 13:32 ` Enric Balletbo i Serra
2020-11-04 10:43 ` [PATCH 0/4] soc: mediatek: Prepare MMSYS for DDP routing using tables Enric Balletbo i Serra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5b6816ca-f3c9-3048-57ca-f6af128fbb0b@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=airlied@linux.ie \
--cc=chunkuang.hu@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=drinkcat@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=hsinyi@chromium.org \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®