]> git.sur5r.net Git - u-boot/blobdiff - lib/efi_loader/efi_gop.c
sunxi: video: HDMI: use correct bits for HSYNC and VSYNC polarity.
[u-boot] / lib / efi_loader / efi_gop.c
index 154f306540601d55933dbdff5f2f74672d214736..1afe8418e127342771b9989ef115d5c69bff5d73 100644 (file)
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  EFI application disk support
  *
  *  Copyright (c) 2016 Alexander Graf
- *
- *  SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -56,7 +55,7 @@ static efi_status_t EFIAPI gop_set_mode(struct efi_gop *this, u32 mode_number)
        return EFI_EXIT(EFI_SUCCESS);
 }
 
-static inline struct efi_gop_pixel efi_vid16_to_blt_col(u16 vid)
+static __always_inline struct efi_gop_pixel efi_vid16_to_blt_col(u16 vid)
 {
        struct efi_gop_pixel blt = {
                .reserved = 0,
@@ -70,31 +69,37 @@ static inline struct efi_gop_pixel efi_vid16_to_blt_col(u16 vid)
        return blt;
 }
 
-static inline u16 efi_blt_col_to_vid16(struct efi_gop_pixel *blt)
+static __always_inline u16 efi_blt_col_to_vid16(struct efi_gop_pixel *blt)
 {
        return (u16)(blt->red   >> 3) << 11 |
               (u16)(blt->green >> 2) <<  5 |
               (u16)(blt->blue  >> 3);
 }
 
-efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
-                           u32 operation, efi_uintn_t sx,
-                           efi_uintn_t sy, efi_uintn_t dx,
-                           efi_uintn_t dy, efi_uintn_t width,
-                           efi_uintn_t height, efi_uintn_t delta)
+static __always_inline efi_status_t gop_blt_int(struct efi_gop *this,
+                                               struct efi_gop_pixel *bufferp,
+                                               u32 operation, efi_uintn_t sx,
+                                               efi_uintn_t sy, efi_uintn_t dx,
+                                               efi_uintn_t dy,
+                                               efi_uintn_t width,
+                                               efi_uintn_t height,
+                                               efi_uintn_t delta,
+                                               efi_uintn_t vid_bpp)
 {
        struct efi_gop_obj *gopobj = container_of(this, struct efi_gop_obj, ops);
-       efi_uintn_t i, j, linelen;
+       efi_uintn_t i, j, linelen, slineoff = 0, dlineoff, swidth, dwidth;
        u32 *fb32 = gopobj->fb;
        u16 *fb16 = gopobj->fb;
-
-       if (delta)
-               linelen = delta;
-       else
+       struct efi_gop_pixel *buffer = __builtin_assume_aligned(bufferp, 4);
+
+       if (delta) {
+               /* Check for 4 byte alignment */
+               if (delta & 3)
+                       return EFI_INVALID_PARAMETER;
+               linelen = delta >> 2;
+       } else {
                linelen = width;
-
-       EFI_ENTRY("%p, %p, %u, %zu, %zu, %zu, %zu, %zu, %zu, %zu", this,
-                 buffer, operation, sx, sy, dx, dy, width, height, delta);
+       }
 
        /* Check source rectangle */
        switch (operation) {
@@ -102,16 +107,16 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
                break;
        case EFI_BLT_BUFFER_TO_VIDEO:
                if (sx + width > linelen)
-                       return EFI_EXIT(EFI_INVALID_PARAMETER);
+                       return EFI_INVALID_PARAMETER;
                break;
        case EFI_BLT_VIDEO_TO_BLT_BUFFER:
        case EFI_BLT_VIDEO_TO_VIDEO:
                if (sx + width > gopobj->info.width ||
                    sy + height > gopobj->info.height)
-                       return EFI_EXIT(EFI_INVALID_PARAMETER);
+                       return EFI_INVALID_PARAMETER;
                break;
        default:
-               return EFI_EXIT(EFI_INVALID_PARAMETER);
+               return EFI_INVALID_PARAMETER;
        }
 
        /* Check destination rectangle */
@@ -121,14 +126,45 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
        case EFI_BLT_VIDEO_TO_VIDEO:
                if (dx + width > gopobj->info.width ||
                    dy + height > gopobj->info.height)
-                       return EFI_EXIT(EFI_INVALID_PARAMETER);
+                       return EFI_INVALID_PARAMETER;
                break;
        case EFI_BLT_VIDEO_TO_BLT_BUFFER:
                if (dx + width > linelen)
-                       return EFI_EXIT(EFI_INVALID_PARAMETER);
+                       return EFI_INVALID_PARAMETER;
+               break;
+       }
+
+       /* Calculate line width */
+       switch (operation) {
+       case EFI_BLT_BUFFER_TO_VIDEO:
+               swidth = linelen;
+               break;
+       case EFI_BLT_VIDEO_TO_BLT_BUFFER:
+       case EFI_BLT_VIDEO_TO_VIDEO:
+               swidth = gopobj->info.width;
+               if (!vid_bpp)
+                       return EFI_UNSUPPORTED;
+               break;
+       case EFI_BLT_VIDEO_FILL:
+               swidth = 0;
+               break;
+       }
+
+       switch (operation) {
+       case EFI_BLT_BUFFER_TO_VIDEO:
+       case EFI_BLT_VIDEO_FILL:
+       case EFI_BLT_VIDEO_TO_VIDEO:
+               dwidth = gopobj->info.width;
+               if (!vid_bpp)
+                       return EFI_UNSUPPORTED;
+               break;
+       case EFI_BLT_VIDEO_TO_BLT_BUFFER:
+               dwidth = linelen;
                break;
        }
 
+       slineoff = swidth * sy;
+       dlineoff = dwidth * dy;
        for (i = 0; i < height; i++) {
                for (j = 0; j < width; j++) {
                        struct efi_gop_pixel pix;
@@ -139,69 +175,198 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
                                pix = *buffer;
                                break;
                        case EFI_BLT_BUFFER_TO_VIDEO:
-                               pix = buffer[linelen * (i + sy) + j + sx];
+                               pix = buffer[slineoff + j + sx];
                                break;
                        case EFI_BLT_VIDEO_TO_BLT_BUFFER:
                        case EFI_BLT_VIDEO_TO_VIDEO:
-                               switch (gopobj->bpix) {
-#ifdef CONFIG_DM_VIDEO
-                               case VIDEO_BPP32:
-#else
-                               case LCD_COLOR32:
-#endif
+                               if (vid_bpp == 32)
                                        pix = *(struct efi_gop_pixel *)&fb32[
-                                               gopobj->info.width *
-                                               (i + sy) + j + sx];
-                               break;
-#ifdef CONFIG_DM_VIDEO
-                               case VIDEO_BPP16:
-#else
-                               case LCD_COLOR16:
-#endif
+                                               slineoff + j + sx];
+                               else
                                        pix = efi_vid16_to_blt_col(fb16[
-                                               gopobj->info.width *
-                                               (i + sy) + j + sx]);
-                                       break;
-                               default:
-                                       return EFI_EXIT(EFI_UNSUPPORTED);
-                               }
+                                               slineoff + j + sx]);
                                break;
                        }
 
                        /* Write destination pixel */
                        switch (operation) {
                        case EFI_BLT_VIDEO_TO_BLT_BUFFER:
-                               buffer[linelen * (i + dy) + j + dx] = pix;
+                               buffer[dlineoff + j + dx] = pix;
                                break;
                        case EFI_BLT_BUFFER_TO_VIDEO:
                        case EFI_BLT_VIDEO_FILL:
                        case EFI_BLT_VIDEO_TO_VIDEO:
-                               switch (gopobj->bpix) {
+                               if (vid_bpp == 32)
+                                       fb32[dlineoff + j + dx] = *(u32 *)&pix;
+                               else
+                                       fb16[dlineoff + j + dx] =
+                                               efi_blt_col_to_vid16(&pix);
+                               break;
+                       }
+               }
+               slineoff += swidth;
+               dlineoff += dwidth;
+       }
+
+       return EFI_SUCCESS;
+}
+
+static efi_uintn_t gop_get_bpp(struct efi_gop *this)
+{
+       struct efi_gop_obj *gopobj = container_of(this, struct efi_gop_obj, ops);
+       efi_uintn_t vid_bpp = 0;
+
+       switch (gopobj->bpix) {
 #ifdef CONFIG_DM_VIDEO
-                               case VIDEO_BPP32:
+       case VIDEO_BPP32:
 #else
-                               case LCD_COLOR32:
+       case LCD_COLOR32:
 #endif
-                                       fb32[gopobj->info.width *
-                                            (i + dy) + j + dx] = *(u32 *)&pix;
-                                       break;
+               vid_bpp = 32;
+               break;
 #ifdef CONFIG_DM_VIDEO
-                               case VIDEO_BPP16:
+       case VIDEO_BPP16:
 #else
-                               case LCD_COLOR16:
+       case LCD_COLOR16:
 #endif
-                                       fb16[gopobj->info.width *
-                                            (i + dy) + j + dx] =
-                                               efi_blt_col_to_vid16(&pix);
-                                       break;
-                               default:
-                                       return EFI_EXIT(EFI_UNSUPPORTED);
-                               }
-                               break;
-                       }
-               }
+               vid_bpp = 16;
+               break;
+       }
+
+       return vid_bpp;
+}
+
+/*
+ * Gcc can't optimize our BLT function well, but we need to make sure that
+ * our 2-dimensional loop gets executed very quickly, otherwise the system
+ * will feel slow.
+ *
+ * By manually putting all obvious branch targets into functions which call
+ * our generic blt function with constants, the compiler can successfully
+ * optimize for speed.
+ */
+static efi_status_t gop_blt_video_fill(struct efi_gop *this,
+                                      struct efi_gop_pixel *buffer,
+                                      u32 foo, efi_uintn_t sx,
+                                      efi_uintn_t sy, efi_uintn_t dx,
+                                      efi_uintn_t dy, efi_uintn_t width,
+                                      efi_uintn_t height, efi_uintn_t delta,
+                                      efi_uintn_t vid_bpp)
+{
+       return gop_blt_int(this, buffer, EFI_BLT_VIDEO_FILL, sx, sy, dx,
+                          dy, width, height, delta, vid_bpp);
+}
+
+static efi_status_t gop_blt_buf_to_vid16(struct efi_gop *this,
+                                        struct efi_gop_pixel *buffer,
+                                        u32 foo, efi_uintn_t sx,
+                                        efi_uintn_t sy, efi_uintn_t dx,
+                                        efi_uintn_t dy, efi_uintn_t width,
+                                        efi_uintn_t height, efi_uintn_t delta)
+{
+       return gop_blt_int(this, buffer, EFI_BLT_BUFFER_TO_VIDEO, sx, sy, dx,
+                          dy, width, height, delta, 16);
+}
+
+static efi_status_t gop_blt_buf_to_vid32(struct efi_gop *this,
+                                        struct efi_gop_pixel *buffer,
+                                        u32 foo, efi_uintn_t sx,
+                                        efi_uintn_t sy, efi_uintn_t dx,
+                                        efi_uintn_t dy, efi_uintn_t width,
+                                        efi_uintn_t height, efi_uintn_t delta)
+{
+       return gop_blt_int(this, buffer, EFI_BLT_BUFFER_TO_VIDEO, sx, sy, dx,
+                          dy, width, height, delta, 32);
+}
+
+static efi_status_t gop_blt_vid_to_vid(struct efi_gop *this,
+                                      struct efi_gop_pixel *buffer,
+                                      u32 foo, efi_uintn_t sx,
+                                      efi_uintn_t sy, efi_uintn_t dx,
+                                      efi_uintn_t dy, efi_uintn_t width,
+                                      efi_uintn_t height, efi_uintn_t delta,
+                                      efi_uintn_t vid_bpp)
+{
+       return gop_blt_int(this, buffer, EFI_BLT_VIDEO_TO_VIDEO, sx, sy, dx,
+                          dy, width, height, delta, vid_bpp);
+}
+
+static efi_status_t gop_blt_vid_to_buf(struct efi_gop *this,
+                                      struct efi_gop_pixel *buffer,
+                                      u32 foo, efi_uintn_t sx,
+                                      efi_uintn_t sy, efi_uintn_t dx,
+                                      efi_uintn_t dy, efi_uintn_t width,
+                                      efi_uintn_t height, efi_uintn_t delta,
+                                      efi_uintn_t vid_bpp)
+{
+       return gop_blt_int(this, buffer, EFI_BLT_VIDEO_TO_BLT_BUFFER, sx, sy,
+                          dx, dy, width, height, delta, vid_bpp);
+}
+
+/*
+ * Copy rectangle.
+ *
+ * This function implements the Blt service of the EFI_GRAPHICS_OUTPUT_PROTOCOL.
+ * See the Unified Extensible Firmware Interface (UEFI) specification for
+ * details.
+ *
+ * @this:      EFI_GRAPHICS_OUTPUT_PROTOCOL
+ * @buffer:    pixel buffer
+ * @sx:                source x-coordinate
+ * @sy:                source y-coordinate
+ * @dx:                destination x-coordinate
+ * @dy:                destination y-coordinate
+ * @width:     width of rectangle
+ * @height:    height of rectangle
+ * @delta:     length in bytes of a line in the pixel buffer (optional)
+ * @return:    status code
+ */
+efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
+                           u32 operation, efi_uintn_t sx,
+                           efi_uintn_t sy, efi_uintn_t dx,
+                           efi_uintn_t dy, efi_uintn_t width,
+                           efi_uintn_t height, efi_uintn_t delta)
+{
+       efi_status_t ret = EFI_INVALID_PARAMETER;
+       efi_uintn_t vid_bpp;
+
+       EFI_ENTRY("%p, %p, %u, %zu, %zu, %zu, %zu, %zu, %zu, %zu", this,
+                 buffer, operation, sx, sy, dx, dy, width, height, delta);
+
+       vid_bpp = gop_get_bpp(this);
+
+       /* Allow for compiler optimization */
+       switch (operation) {
+       case EFI_BLT_VIDEO_FILL:
+               ret = gop_blt_video_fill(this, buffer, operation, sx, sy, dx,
+                                        dy, width, height, delta, vid_bpp);
+               break;
+       case EFI_BLT_BUFFER_TO_VIDEO:
+               /* This needs to be super-fast, so duplicate for 16/32bpp */
+               if (vid_bpp == 32)
+                       ret = gop_blt_buf_to_vid32(this, buffer, operation, sx,
+                                                  sy, dx, dy, width, height,
+                                                  delta);
+               else
+                       ret = gop_blt_buf_to_vid16(this, buffer, operation, sx,
+                                                  sy, dx, dy, width, height,
+                                                  delta);
+               break;
+       case EFI_BLT_VIDEO_TO_VIDEO:
+               ret = gop_blt_vid_to_vid(this, buffer, operation, sx, sy, dx,
+                                        dy, width, height, delta, vid_bpp);
+               break;
+       case EFI_BLT_VIDEO_TO_BLT_BUFFER:
+               ret = gop_blt_vid_to_buf(this, buffer, operation, sx, sy, dx,
+                                        dy, width, height, delta, vid_bpp);
+               break;
+       default:
+               ret = EFI_UNSUPPORTED;
        }
 
+       if (ret != EFI_SUCCESS)
+               return EFI_EXIT(ret);
+
 #ifdef CONFIG_DM_VIDEO
        video_sync_all();
 #else