| Message ID | 20201124124538.660710-40-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert DSI code to use drm_mipi_dsi and drm_panel | expand |
On Tue, 24 Nov 2020 04:44:57 -0800, Tomi Valkeinen wrote: > > From: Sebastian Reichel <sebastian.reichel@collabora.com> > > The panel driver is no longer using any OMAP specific APIs, so > let's move it into the generic panel directory. > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Acked-by: Sam Ravnborg <sam@ravnborg.org> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/omapdrm/Kconfig | 1 - > drivers/gpu/drm/omapdrm/Makefile | 1 - > drivers/gpu/drm/omapdrm/displays/Kconfig | 10 ---------- > drivers/gpu/drm/omapdrm/displays/Makefile | 2 -- > drivers/gpu/drm/panel/Kconfig | 9 +++++++++ > drivers/gpu/drm/panel/Makefile | 1 + > .../gpu/drm/{omapdrm/displays => panel}/panel-dsi-cm.c | 0 Not sure if it's a result of this commit but on drm-tip we see: $ make allmodconfig $ make modules_check DESCEND objtool CALL scripts/atomic/check-atomics.sh CALL scripts/checksyscalls.sh CHK include/generated/compile.h error: the following would cause module name conflict: drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko drivers/gpu/drm/panel/panel-dsi-cm.ko make: *** [Makefile:1400: modules_check] Error 1
Hi, On Fri, Jan 08, 2021 at 01:23:54PM -0800, Dixit, Ashutosh wrote: > On Tue, 24 Nov 2020 04:44:57 -0800, Tomi Valkeinen wrote: > > > > From: Sebastian Reichel <sebastian.reichel@collabora.com> > > > > The panel driver is no longer using any OMAP specific APIs, so > > let's move it into the generic panel directory. > > > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Acked-by: Sam Ravnborg <sam@ravnborg.org> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > drivers/gpu/drm/omapdrm/Kconfig | 1 - > > drivers/gpu/drm/omapdrm/Makefile | 1 - > > drivers/gpu/drm/omapdrm/displays/Kconfig | 10 ---------- > > drivers/gpu/drm/omapdrm/displays/Makefile | 2 -- > > drivers/gpu/drm/panel/Kconfig | 9 +++++++++ > > drivers/gpu/drm/panel/Makefile | 1 + > > .../gpu/drm/{omapdrm/displays => panel}/panel-dsi-cm.c | 0 > > Not sure if it's a result of this commit but on drm-tip we see: > > $ make allmodconfig > $ make modules_check > DESCEND objtool > CALL scripts/atomic/check-atomics.sh > CALL scripts/checksyscalls.sh > CHK include/generated/compile.h > error: the following would cause module name conflict: > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko > drivers/gpu/drm/panel/panel-dsi-cm.ko > make: *** [Makefile:1400: modules_check] Error 1 It is a result of this commit and it has already been reported by Stephen Rothwell. The thread also contains a patch to fixup the problem: https://lore.kernel.org/linux-next/20210108195839.GA1429715@ravnborg.org/T/#m0eee5e806cc93cf9982620b7b8b9f77df2c37498 Sorry for the inconvenience, -- Sebastian
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig index 5417e7a47072..cea3f44ea6d4 100644 --- a/drivers/gpu/drm/omapdrm/Kconfig +++ b/drivers/gpu/drm/omapdrm/Kconfig @@ -12,6 +12,5 @@ config DRM_OMAP if DRM_OMAP source "drivers/gpu/drm/omapdrm/dss/Kconfig" -source "drivers/gpu/drm/omapdrm/displays/Kconfig" endif diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile index f115253115c5..66a73eae6f7c 100644 --- a/drivers/gpu/drm/omapdrm/Makefile +++ b/drivers/gpu/drm/omapdrm/Makefile @@ -5,7 +5,6 @@ # obj-y += dss/ -obj-y += displays/ omapdrm-y := omap_drv.o \ omap_irq.o \ diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig deleted file mode 100644 index f2be594c7eff..000000000000 --- a/drivers/gpu/drm/omapdrm/displays/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menu "OMAPDRM External Display Device Drivers" - -config DRM_OMAP_PANEL_DSI_CM - tristate "Generic DSI Command Mode Panel" - depends on BACKLIGHT_CLASS_DEVICE - help - Driver for generic DSI command mode panels. - -endmenu diff --git a/drivers/gpu/drm/omapdrm/displays/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile deleted file mode 100644 index 488ddf153613..000000000000 --- a/drivers/gpu/drm/omapdrm/displays/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_DRM_OMAP_PANEL_DSI_CM) += panel-dsi-cm.o diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index b9dbedf8f15e..a71f95afc52e 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -48,6 +48,15 @@ config DRM_PANEL_BOE_TV101WUM_NL6 Say Y here if you want to support for BOE TV101WUM and AUO KD101N80 45NA WUXGA PANEL DSI Video Mode panel +config DRM_PANEL_DSI_CM + tristate "Generic DSI command mode panels" + depends on OF + depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE + help + DRM panel driver for DSI command mode panels with support for + embedded and external backlights. + config DRM_PANEL_LVDS tristate "Generic LVDS panel driver" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 2ba560bca61d..c553e968e9a9 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_DRM_PANEL_ARM_VERSATILE) += panel-arm-versatile.o obj-$(CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596) += panel-asus-z00t-tm5p5-n35596.o obj-$(CONFIG_DRM_PANEL_BOE_HIMAX8279D) += panel-boe-himax8279d.o obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o +obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o obj-$(CONFIG_DRM_PANEL_ELIDA_KD35T133) += panel-elida-kd35t133.o diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/panel/panel-dsi-cm.c similarity index 100% rename from drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c rename to drivers/gpu/drm/panel/panel-dsi-cm.c