| Message ID | 20250113145232.227674-11-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for MT8195/88 DPI, HDMIv2 and DDCv2 | expand |
On 13/01/2025 15:52, AngeloGioacchino Del Regno wrote: > In preparation for splitting out the common bits from the HDMI > driver, change the mtk_cec driver from being registered from the > HDMI driver itself to be a module_platform_driver of its own. > > With this change, there are no more users of the mtk_hdmi.h header > so, while at it, also remove it. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
On Mon, 2025-01-13 at 15:52 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until you have verified the sender or the content. > > > In preparation for splitting out the common bits from the HDMI > driver, change the mtk_cec driver from being registered from the > HDMI driver itself to be a module_platform_driver of its own. "change the mtk_hdmi_ddc driver" I think ddc is not the common part, so the reason is not splitting out the common bits. > > With this change, there are no more users of the mtk_hdmi.h header > so, while at it, also remove it. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/Makefile | 6 ++---- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 -- > drivers/gpu/drm/mediatek/mtk_hdmi.h | 13 ------------- > drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- > 4 files changed, 3 insertions(+), 20 deletions(-) > delete mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.h > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index bdd3a062f797..43afd0a26d14 100644 > --- a/drivers/gpu/drm/mediatek/Makefile > +++ b/drivers/gpu/drm/mediatek/Makefile > @@ -21,10 +21,8 @@ mediatek-drm-y := mtk_crtc.o \ > > obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o > > -mediatek-drm-hdmi-objs := mtk_hdmi.o \ > - mtk_hdmi_ddc.o > - > obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_cec.o > -obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o > +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi.o > +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi_ddc.o It's not necessary to separate ddc to an independent module. Regards, CK > > obj-$(CONFIG_DRM_MEDIATEK_DP) += mtk_dp.o > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index da725182f0db..e648fb5714e7 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -31,7 +31,6 @@ > #include <drm/drm_probe_helper.h> > > #include "mtk_cec.h" > -#include "mtk_hdmi.h" > #include "mtk_hdmi_regs.h" > > #define NCTS_BYTES 7 > @@ -1804,7 +1803,6 @@ static struct platform_driver mtk_hdmi_driver = { > }; > > static struct platform_driver * const mtk_hdmi_drivers[] = { > - &mtk_hdmi_ddc_driver, > &mtk_hdmi_driver, > }; > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.h b/drivers/gpu/drm/mediatek/mtk_hdmi.h > deleted file mode 100644 > index e40bc4651995..000000000000 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.h > +++ /dev/null > @@ -1,13 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > -/* > - * Copyright (c) 2014 MediaTek Inc. > - * Author: Jie Qiu <jie.qiu@mediatek.com> > - */ > -#ifndef _MTK_HDMI_CTRL_H > -#define _MTK_HDMI_CTRL_H > - > -struct platform_driver; > - > -extern struct platform_driver mtk_hdmi_ddc_driver; > - > -#endif /* _MTK_HDMI_CTRL_H */ > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > index 07db68067844..6358e1af69b4 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c > @@ -20,7 +20,6 @@ > #include <linux/of_platform.h> > > #include "mtk_drm_drv.h" > -#include "mtk_hdmi.h" > > #define SIF1_CLOK (288) > #define DDC_DDCMCTL0 (0x0) > @@ -337,6 +336,7 @@ struct platform_driver mtk_hdmi_ddc_driver = { > .of_match_table = mtk_hdmi_ddc_match, > }, > }; > +module_platform_driver(mtk_hdmi_ddc_driver); > > MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>"); > MODULE_DESCRIPTION("MediaTek HDMI DDC Driver"); > -- > 2.47.0 >
Il 10/02/25 08:01, CK Hu (胡俊光) ha scritto: > On Mon, 2025-01-13 at 15:52 +0100, AngeloGioacchino Del Regno wrote: >> External email : Please do not click links or open attachments until you have verified the sender or the content. >> >> >> In preparation for splitting out the common bits from the HDMI >> driver, change the mtk_cec driver from being registered from the >> HDMI driver itself to be a module_platform_driver of its own. > > "change the mtk_hdmi_ddc driver" > > I think ddc is not the common part, so the reason is not splitting out the common bits. > Thanks, I didn't notice this typo! Regards, Angelo >> >> With this change, there are no more users of the mtk_hdmi.h header >> so, while at it, also remove it. >> >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> --- >> drivers/gpu/drm/mediatek/Makefile | 6 ++---- >> drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 -- >> drivers/gpu/drm/mediatek/mtk_hdmi.h | 13 ------------- >> drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- >> 4 files changed, 3 insertions(+), 20 deletions(-) >> delete mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.h >> >> diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile >> index bdd3a062f797..43afd0a26d14 100644 >> --- a/drivers/gpu/drm/mediatek/Makefile >> +++ b/drivers/gpu/drm/mediatek/Makefile >> @@ -21,10 +21,8 @@ mediatek-drm-y := mtk_crtc.o \ >> >> obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o >> >> -mediatek-drm-hdmi-objs := mtk_hdmi.o \ >> - mtk_hdmi_ddc.o >> - >> obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_cec.o >> -obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o >> +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi.o >> +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi_ddc.o > > It's not necessary to separate ddc to an independent module. > > Regards, > CK > >> >> obj-$(CONFIG_DRM_MEDIATEK_DP) += mtk_dp.o >> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c >> index da725182f0db..e648fb5714e7 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c >> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c >> @@ -31,7 +31,6 @@ >> #include <drm/drm_probe_helper.h> >> >> #include "mtk_cec.h" >> -#include "mtk_hdmi.h" >> #include "mtk_hdmi_regs.h" >> >> #define NCTS_BYTES 7 >> @@ -1804,7 +1803,6 @@ static struct platform_driver mtk_hdmi_driver = { >> }; >> >> static struct platform_driver * const mtk_hdmi_drivers[] = { >> - &mtk_hdmi_ddc_driver, >> &mtk_hdmi_driver, >> }; >> >> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.h b/drivers/gpu/drm/mediatek/mtk_hdmi.h >> deleted file mode 100644 >> index e40bc4651995..000000000000 >> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.h >> +++ /dev/null >> @@ -1,13 +0,0 @@ >> -/* SPDX-License-Identifier: GPL-2.0-only */ >> -/* >> - * Copyright (c) 2014 MediaTek Inc. >> - * Author: Jie Qiu <jie.qiu@mediatek.com> >> - */ >> -#ifndef _MTK_HDMI_CTRL_H >> -#define _MTK_HDMI_CTRL_H >> - >> -struct platform_driver; >> - >> -extern struct platform_driver mtk_hdmi_ddc_driver; >> - >> -#endif /* _MTK_HDMI_CTRL_H */ >> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c >> index 07db68067844..6358e1af69b4 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c >> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c >> @@ -20,7 +20,6 @@ >> #include <linux/of_platform.h> >> >> #include "mtk_drm_drv.h" >> -#include "mtk_hdmi.h" >> >> #define SIF1_CLOK (288) >> #define DDC_DDCMCTL0 (0x0) >> @@ -337,6 +336,7 @@ struct platform_driver mtk_hdmi_ddc_driver = { >> .of_match_table = mtk_hdmi_ddc_match, >> }, >> }; >> +module_platform_driver(mtk_hdmi_ddc_driver); >> >> MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>"); >> MODULE_DESCRIPTION("MediaTek HDMI DDC Driver"); >> -- >> 2.47.0 >> >
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile index bdd3a062f797..43afd0a26d14 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -21,10 +21,8 @@ mediatek-drm-y := mtk_crtc.o \ obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o -mediatek-drm-hdmi-objs := mtk_hdmi.o \ - mtk_hdmi_ddc.o - obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_cec.o -obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi.o +obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi_ddc.o obj-$(CONFIG_DRM_MEDIATEK_DP) += mtk_dp.o diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index da725182f0db..e648fb5714e7 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -31,7 +31,6 @@ #include <drm/drm_probe_helper.h> #include "mtk_cec.h" -#include "mtk_hdmi.h" #include "mtk_hdmi_regs.h" #define NCTS_BYTES 7 @@ -1804,7 +1803,6 @@ static struct platform_driver mtk_hdmi_driver = { }; static struct platform_driver * const mtk_hdmi_drivers[] = { - &mtk_hdmi_ddc_driver, &mtk_hdmi_driver, }; diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.h b/drivers/gpu/drm/mediatek/mtk_hdmi.h deleted file mode 100644 index e40bc4651995..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2014 MediaTek Inc. - * Author: Jie Qiu <jie.qiu@mediatek.com> - */ -#ifndef _MTK_HDMI_CTRL_H -#define _MTK_HDMI_CTRL_H - -struct platform_driver; - -extern struct platform_driver mtk_hdmi_ddc_driver; - -#endif /* _MTK_HDMI_CTRL_H */ diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c index 07db68067844..6358e1af69b4 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c @@ -20,7 +20,6 @@ #include <linux/of_platform.h> #include "mtk_drm_drv.h" -#include "mtk_hdmi.h" #define SIF1_CLOK (288) #define DDC_DDCMCTL0 (0x0) @@ -337,6 +336,7 @@ struct platform_driver mtk_hdmi_ddc_driver = { .of_match_table = mtk_hdmi_ddc_match, }, }; +module_platform_driver(mtk_hdmi_ddc_driver); MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>"); MODULE_DESCRIPTION("MediaTek HDMI DDC Driver");
In preparation for splitting out the common bits from the HDMI driver, change the mtk_cec driver from being registered from the HDMI driver itself to be a module_platform_driver of its own. With this change, there are no more users of the mtk_hdmi.h header so, while at it, also remove it. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/gpu/drm/mediatek/Makefile | 6 ++---- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 -- drivers/gpu/drm/mediatek/mtk_hdmi.h | 13 ------------- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.h