lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[display] Refactor to avoid implicit framebuffer allocation.

Browse Source 
Preparation to allow other images to be presented to the display.
Separate definitions of display and image formats.
display_get_info no longer provides a framebuffer.
display_get_framebuffer allocates a framebuffer for convenience.

Review URL: https://codereview.chromium.org/1777783003 .
This commit is contained in:
cstout
2016-03-10 09:49:22 -08:00
parent e290cb1b8b
commit c1255f7f47
16 changed files with 333 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
target/stm32746g-eval2/lcd.c
View File

@@ -54,7 +54,6 @@
#include <target.h>
#include <compiler.h>
#include <string.h>
#include <lib/gfx.h>
#include <dev/gpio.h>
#include <dev/display.h>
#include <arch/ops.h>
@@ -389,14 +388,37 @@ uint8_t BSP_LCD_Init(void)
}
/* LK display api here */
status_t display_get_info(struct display_info *info)
status_t display_get_framebuffer(struct display_framebuffer *fb)
{
info->framebuffer = (void *)hLtdcEval.LayerCfg[ActiveLayer].FBStartAdress;
fb->image.pixels = (void *)hLtdcEval.LayerCfg[ActiveLayer].FBStartAdress;
if (hLtdcEval.LayerCfg[ActiveLayer].PixelFormat == LTDC_PIXEL_FORMAT_ARGB8888) {
info->format = GFX_FORMAT_ARGB_8888;
fb->format = DISPLAY_FORMAT_ARGB_8888;
fb->image.format = IMAGE_FORMAT_ARGB_8888;
fb->image.rowbytes = BSP_LCD_GetXSize() * 4;
} else if (hLtdcEval.LayerCfg[ActiveLayer].PixelFormat == LTDC_PIXEL_FORMAT_RGB565) {
info->format = GFX_FORMAT_RGB_565;
fb->format = DISPLAY_FORMAT_RGB_565;
fb->image.format = IMAGE_FORMAT_RGB_565;
fb->image.rowbytes = BSP_LCD_GetXSize() * 2;
} else {
panic("unhandled pixel format\n");
return ERR_NOT_FOUND;
}
fb->image.width = BSP_LCD_GetXSize();
fb->image.height = BSP_LCD_GetYSize();
fb->image.stride = BSP_LCD_GetXSize();
fb->flush = NULL;
return NO_ERROR;
}
status_t display_get_info(struct display_info *info)
{
if (hLtdcEval.LayerCfg[ActiveLayer].PixelFormat == LTDC_PIXEL_FORMAT_ARGB8888) {
info->format = DISPLAY_FORMAT_ARGB_8888;
} else if (hLtdcEval.LayerCfg[ActiveLayer].PixelFormat == LTDC_PIXEL_FORMAT_RGB565) {
info->format = DISPLAY_FORMAT_RGB_565;
} else {
panic("unhandled pixel format\n");
return ERR_NOT_FOUND;
@@ -404,9 +426,6 @@ status_t display_get_info(struct display_info *info)
info->width = BSP_LCD_GetXSize();
info->height = BSP_LCD_GetYSize();
info->stride = BSP_LCD_GetXSize();
info->flush = NULL;
return NO_ERROR;
}