1 files changed, 94 insertions, 23 deletions

diff --git a/src/gallium/winsys/etna/fbdev/etna_fbdev_winsys.c b/src/gallium/winsys/etna/fbdev/etna_fbdev_winsys.c
index ea92712ae2..da22458d90 100644
--- a/src/gallium/winsys/etna/fbdev/etna_fbdev_winsys.c
+++ b/src/gallium/winsys/etna/fbdev/etna_fbdev_winsys.c
@@ -9,6 +9,7 @@
 #include "etna_fbdev_public.h"
 
 #include "etna/etna_screen.h"
+#include "etna/etna_pipe.h"
 
 #include <etnaviv/viv.h>
 #include <etnaviv/etna_bo.h>
@@ -24,14 +25,81 @@ struct etna_fbdev_screen
    /* anything? */
 };
 
-static inline struct etna_fbdev_screen *etna_fbdev_screen(struct native_fbdev_screen *fbdev_screen)
+static void etna_fbdev_screen_destroy(struct native_fbdev_screen *fbdev_screen)
 {
-   return (struct etna_fbdev_screen*)fbdev_screen;
+   FREE(fbdev_screen);
 }
 
-static void etna_fbdev_screen_destroy(struct native_fbdev_screen *fbdev_screen)
+struct etna_fb_format_desc
 {
-   FREE(fbdev_screen);
+   unsigned bits_per_pixel;
+   unsigned red_offset;
+   unsigned red_length;
+   unsigned green_offset;
+   unsigned green_length;
+   unsigned blue_offset;
+   unsigned blue_length;
+   unsigned alpha_offset;
+   unsigned alpha_length;
+   enum pipe_format format;
+};
+
+static const struct etna_fb_format_desc etna_fb_formats[] = {
+/* bpp  ro  rl go gl bo  bl ao  al gs format        */
+   {32, 16, 8, 8, 8, 0 , 8, 0,  0, PIPE_FORMAT_B8G8R8X8_UNORM},
+   {32, 0 , 8, 8, 8, 16, 8, 0,  0, PIPE_FORMAT_R8G8B8X8_UNORM},
+   {32, 16, 8, 8, 8, 0 , 8, 24, 8, PIPE_FORMAT_B8G8R8A8_UNORM},
+   {32, 0 , 8, 8, 8, 16, 8, 24, 8, PIPE_FORMAT_R8G8B8A8_UNORM},
+   {16, 8 , 4, 4, 4, 0,  4, 12, 4, PIPE_FORMAT_B4G4R4A4_UNORM},
+   {16, 10, 5, 5, 5, 0,  5, 0,  0, PIPE_FORMAT_B5G5R5X1_UNORM},
+   {16, 10, 5, 5, 5, 0,  5, 15, 1, PIPE_FORMAT_B5G5R5A1_UNORM},
+   {16, 11, 5, 5, 6, 0,  5, 0,  0, PIPE_FORMAT_B5G6R5_UNORM  },
+};
+
+#define NUM_FB_FORMATS (sizeof(etna_fb_formats) / sizeof(etna_fb_formats[0]))
+
+/* Get resolve format and swap red/blue format based on report on red/green/blue
+ * bit positions from kernel.
+ */
+static enum pipe_format etna_fbdev_get_format(const struct fb_var_screeninfo *fb_var)
+{
+   int fmt_idx = 0;
+
+   if (fb_var->grayscale)
+      return PIPE_FORMAT_COUNT;
+
+   /* linear scan of table to find matching format */
+   for (fmt_idx = 0; fmt_idx<NUM_FB_FORMATS; ++fmt_idx)
+   {
+      const struct etna_fb_format_desc *desc = &etna_fb_formats[fmt_idx];
+         if(desc->red_offset == fb_var->red.offset &&
+            desc->red_length == fb_var->red.length &&
+            desc->green_offset == fb_var->green.offset &&
+            desc->green_length == fb_var->green.length &&
+            desc->blue_offset == fb_var->blue.offset &&
+            desc->blue_length == fb_var->blue.length &&
+            (desc->alpha_offset == fb_var->transp.offset || desc->alpha_length == 0) &&
+            desc->alpha_length == fb_var->transp.length)
+         {
+            break;
+         }
+   }
+   /* no matching format found */
+   if (fmt_idx == NUM_FB_FORMATS)
+   {
+      printf("Unsupported framebuffer format: red_offset=%i red_length=%i green_offset=%i green_length=%i blue_offset=%i blue_length=%i trans_offset=%i transp_length=%i grayscale=%i\n",
+                (int)fb_var->red.offset, (int)fb_var->red.length,
+                (int)fb_var->green.offset, (int)fb_var->green.length,
+                (int)fb_var->blue.offset, (int)fb_var->blue.length,
+                (int)fb_var->transp.offset, (int)fb_var->transp.length,
+                (int)fb_var->grayscale);
+       return PIPE_FORMAT_COUNT;
+   }
+
+   printf("Framebuffer format: %s\n",util_format_short_name(
+            etna_fb_formats[fmt_idx].format));
+
+   return etna_fb_formats[fmt_idx].format;
 }
 
 static void *etna_fbdev_create_drawable(struct native_fbdev_screen *fbdev_screen,
@@ -39,7 +107,7 @@ static void *etna_fbdev_create_drawable(struct native_fbdev_screen *fbdev_screen
           unsigned xoffset, unsigned yoffset,
           unsigned width, unsigned height)
 {
-   struct etna_rs_target *drawable = CALLOC_STRUCT(etna_rs_target);
+   struct etna_resource *drawable = CALLOC_STRUCT(etna_resource);
    struct fb_var_screeninfo vinfo;
    struct fb_fix_screeninfo finfo;
    struct etna_screen *screen = etna_screen(fbdev_screen->screen);
@@ -63,33 +131,36 @@ static void *etna_fbdev_create_drawable(struct native_fbdev_screen *fbdev_screen
          height = vinfo.yres_virtual - yoffset;
    }
 
-   drawable->width = width;
-   drawable->height = height;
+   drawable->base.format = etna_fbdev_get_format(&vinfo);
+   if (drawable->base.format == PIPE_FORMAT_COUNT) {
+      FREE(drawable);
+      return NULL;
+   }
+
    drawable->bo = etna_bo_from_fbdev(screen->dev, fd,
       finfo.line_length * yoffset + vinfo.bits_per_pixel / 8 * xoffset,
       finfo.line_length * height);
-   drawable->stride = finfo.line_length;
+   drawable->layout = ETNA_LAYOUT_LINEAR;
+
+   drawable->levels[0].width = width;
+   drawable->levels[0].height = height;
+   drawable->levels[0].padded_width = width;
+   drawable->levels[0].padded_height = height;
+   drawable->levels[0].stride = finfo.line_length;
+
+   drawable->base.screen = fbdev_screen->screen;
+   pipe_reference_init(&drawable->base.reference, 1);
 
-   if(width == 0 || height == 0 ||
-      !etna_fb_get_format(&vinfo, &drawable->rs_format, &drawable->swap_rb))
-   {
-      FREE(drawable);
-      return NULL;
-   }
    return drawable;
 }
 
 static void etna_fbdev_destroy_drawable(struct native_fbdev_screen *fbdev_screen, void *hdrawable)
 {
-   struct etna_rs_target *drawable = (struct etna_rs_target*)hdrawable;
-   fbdev_screen->screen->fence_reference(fbdev_screen->screen, &drawable->fence, NULL);
-   FREE(drawable);
-}
+   struct etna_resource *drawable = hdrawable;
+   struct etna_screen *screen = etna_screen(fbdev_screen->screen);
 
-static struct pipe_fence_handle *etna_fbdev_get_drawable_fence(struct native_fbdev_screen *fbdev_screen, void *hdrawable)
-{
-   struct etna_rs_target *drawable = (struct etna_rs_target*)hdrawable;
-   return (struct pipe_fence_handle*)drawable->fence;
+   etna_bo_del(screen->dev, drawable->bo, NULL);
+   FREE(drawable);
 }
 
 static bool etna_fbdev_probe(const struct native_fbdev_driver *driver)
@@ -115,7 +186,7 @@ static struct native_fbdev_screen *etna_fbdev_create_screen(
    fscreen->base.destroy = etna_fbdev_screen_destroy;
    fscreen->base.create_drawable = etna_fbdev_create_drawable;
    fscreen->base.destroy_drawable = etna_fbdev_destroy_drawable;
-   fscreen->base.get_drawable_fence = etna_fbdev_get_drawable_fence;
+
    return &fscreen->base;
 }