GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

video: ipuv3: remove non-DM code

Browse source 
All ipuv3 users have been converted, drop obsolete code.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Anatolij Gustschin 2020-05-26 09:38:17 +02:00
parent 3715791e8a
commit fb3dd9c005
2 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/imx/Kconfig
View file

@ -1,7 +1,7 @@
config VIDEO_IPUV3 config VIDEO_IPUV3
bool "i.MX IPUv3 Core video support" bool "i.MX IPUv3 Core video support"
depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) depends on DM_VIDEO && (MX5 || MX6)
help help
This enables framebuffer driver for i.MX processors working This enables framebuffer driver for i.MX processors working
on the IPUv3(Image Processing Unit) internal graphic processor. on the IPUv3(Image Processing Unit) internal graphic processor.

43
drivers/video/imx/mxc_ipuv3_fb.c
View file

@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_map_video_memory(struct fb_info *fbi);
static int mxcfb_unmap_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi);
#if !CONFIG_IS_ENABLED(DM_VIDEO)
/* graphics setup */
static GraphicDevice panel;
#endif
static struct fb_videomode const *gmode; static struct fb_videomode const *gmode;
static uint8_t gdisp; static uint8_t gdisp;
static uint32_t gpixfmt; static uint32_t gpixfmt;
@ -391,12 +387,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi)
} }
fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN); fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN);
#if CONFIG_IS_ENABLED(DM_VIDEO)
fbi->screen_base = (char *)gd->video_bottom; fbi->screen_base = (char *)gd->video_bottom;
#else
fbi->screen_base = (char *)memalign(ARCH_DMA_MINALIGN,
fbi->fix.smem_len);
#endif
fbi->fix.smem_start = (unsigned long)fbi->screen_base; fbi->fix.smem_start = (unsigned long)fbi->screen_base;
if (fbi->screen_base == 0) { if (fbi->screen_base == 0) {
@ -410,10 +401,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi)
(uint32_t) fbi->fix.smem_start, fbi->fix.smem_len); (uint32_t) fbi->fix.smem_start, fbi->fix.smem_len);
fbi->screen_size = fbi->fix.smem_len; fbi->screen_size = fbi->fix.smem_len;
#if CONFIG_IS_ENABLED(VIDEO)
gd->fb_base = fbi->fix.smem_start; gd->fb_base = fbi->fix.smem_start;
#endif
/* Clear the screen */ /* Clear the screen */
memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
@ -544,18 +532,6 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
mxcfb_set_par(fbi); mxcfb_set_par(fbi);
#if !CONFIG_IS_ENABLED(DM_VIDEO)
panel.winSizeX = mode->xres;
panel.winSizeY = mode->yres;
panel.plnSizeX = mode->xres;
panel.plnSizeY = mode->yres;
panel.frameAdrs = (u32)fbi->screen_base;
panel.memSize = fbi->screen_size;
panel.gdfBytesPP = 2;
panel.gdfIndex = GDF_16BIT_565RGB;
#endif
#ifdef DEBUG #ifdef DEBUG
ipu_dump_registers(); ipu_dump_registers();
#endif #endif
@ -585,23 +561,6 @@ void ipuv3_fb_shutdown(void)
} }
} }
#if !CONFIG_IS_ENABLED(DM_VIDEO)
void *video_hw_init(void)
{
int ret;
ret = ipu_probe();
if (ret)
puts("Error initializing IPU\n");
ret = mxcfb_probe(gpixfmt, gdisp, gmode);
debug("Framebuffer at 0x%x\n", (unsigned int)panel.frameAdrs);
gd->fb_base = panel.frameAdrs;
return (void *)&panel;
}
#endif
int ipuv3_fb_init(struct fb_videomode const *mode, int ipuv3_fb_init(struct fb_videomode const *mode,
uint8_t disp, uint8_t disp,
uint32_t pixfmt) uint32_t pixfmt)
@ -613,7 +572,6 @@ int ipuv3_fb_init(struct fb_videomode const *mode,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(DM_VIDEO)
enum { enum {
/* Maximum display size we support */ /* Maximum display size we support */
LCD_MAX_WIDTH = 1920, LCD_MAX_WIDTH = 1920,
@ -711,4 +669,3 @@ U_BOOT_DRIVER(ipuv3_video) = {
.priv_auto_alloc_size = sizeof(struct ipuv3_video_priv), .priv_auto_alloc_size = sizeof(struct ipuv3_video_priv),
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
}; };
#endif /* CONFIG_DM_VIDEO */