[display] Refactor to avoid implicit framebuffer allocation.

target/stm32f746g-disco/lcd.c

 /*
  * Copyright (c) 2015 Carlos Pizano-Uribe <cpu@chromium.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
  * (the "Software"), to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
  * and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
@@ skipping 36 matching lines @@
  *
  ******************************************************************************
  */
 
 #include <err.h>
 #include <debug.h>
 #include <trace.h>
 #include <target.h>
 #include <compiler.h>
 #include <string.h>
-#include <lib/gfx.h>
 #include <dev/gpio.h>
 #include <dev/display.h>
 #include <kernel/novm.h>
 #include <platform/stm32.h>
 
 /*
  * lcd initialization sequence, taken from
  * STM32Cube_FW_F7_V1.1.0/Drivers/BSP/STM32746G_Disco/stm32746g_discovery_lcd.[ch]
  *
  * This code only applies to The RK043FN48H LCD 480x272.
@@ skipping 327 matching lines @@
     /* clear framebuffer */
     memset((void *)ltdc_handle.LayerCfg[active_layer].FBStartAdress, 0,
            BSP_LCD_GetXSize() * BSP_LCD_GetYSize() * BSP_LCD_PixelSize());
 
     /* turn the display on */
     BSP_LCD_DisplayOn();
     return LCD_OK;
 }
 
 /* LK display (lib/gfx.h) calls this function */
-status_t display_get_info(struct display_info *info)
+status_t display_get_framebuffer(struct display_framebuffer *fb)
 {
-    info->framebuffer = (void *)ltdc_handle.LayerCfg[active_layer].FBStartAdress;
+    fb->image.pixels = (void *)ltdc_handle.LayerCfg[active_layer].FBStartAdress;
 
     if (ltdc_handle.LayerCfg[active_layer].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 (ltdc_handle.LayerCfg[active_layer].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 (ltdc_handle.LayerCfg[active_layer].PixelFormat == LTDC_PIXEL_FORMAT_ARGB8888) {
+        info->format = DISPLAY_FORMAT_ARGB_8888;
+    } else if (ltdc_handle.LayerCfg[active_layer].PixelFormat == LTDC_PIXEL_FORMAT_RGB565) {
+        info->format = DISPLAY_FORMAT_RGB_565;
+    } else {
+        panic("unhandled pixel format\n");
+        return ERR_NOT_FOUND;
     }
 
     info->width = BSP_LCD_GetXSize();
     info->height = BSP_LCD_GetYSize();
-    info->stride = BSP_LCD_GetXSize();
-    info->flush = NULL;
 
     return NO_ERROR;
 }
-