On Fr, 2022-12-16 at 22:00 +0100, Uwe Kleine-König wrote: > Hallo Philipp, > > On Fri, Dec 16, 2022 at 07:05:13PM +0100, Philipp Zabel wrote: > > On Fr, 2022-12-16 at 18:50 +0100, Uwe Kleine-König wrote: > > > From: Marian Cichy <m.cichy@xxxxxxxxxxxxxx> > > > > > > Add support for the LCD Controller found on i.MX21 and i.MX25. > > > > > > It targets to be a drop in replacement for the imx-fb driver. > > > > > > Signed-off-by: Marian Cichy <m.cichy@xxxxxxxxxxxxxx> > > > [ukl: Rebase to v6.1, various smaller fixes] > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > > > --- > > > drivers/gpu/drm/imx/Kconfig | 1 + > > > drivers/gpu/drm/imx/Makefile | 1 + > > > > I miss drivers/gpu/drm/imx/lcdc/{Kconfig,Makefile}. > > Their content is: > > ----- Kconfig ----- > config DRM_IMX_LCDC > tristate "Freescale i.MX LCDC displays" > depends on DRM && (ARCH_MXC || COMPILE_TEST) > select DRM_GEM_DMA_HELPER > select DRM_KMS_HELPER > help > Found on i.MX1, i.MX21, i.MX25 and i.MX27. > ----- Makefile ----- > obj-y += imx-lcdc.o > ----- >8 ----------- > > will resend the series once both dependent patches are in Linus' tree. > Until then this v3 should be good enough to give reviewers a chance to > look. Please also rebase past 8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate source file") and 00b5497d642b ("drm/simple-kms: Remove drm_gem_simple_display_pipe_prepare_fb()"). These changes let me compile imx-lcdc.c on top of drm-misc-next: ----------8<---------- diff --git a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c index 79fbb7956374..1bb46a346377 100644 --- a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c +++ b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c @@ -4,7 +4,7 @@ #include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_dma_helper.h> -#include <drm/drm_fb_helper.h> +#include <drm/drm_fbdev_generic.h> #include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> @@ -368,7 +368,6 @@ static const struct drm_simple_display_pipe_funcs imx_lcdc_pipe_funcs = { .disable = imx_lcdc_pipe_disable, .check = imx_lcdc_pipe_check, .update = imx_lcdc_pipe_update, - .prepare_fb = drm_gem_simple_display_pipe_prepare_fb, }; static const struct drm_mode_config_funcs imx_lcdc_mode_config_funcs = { ---------->8---------- regards Philipp