efi_loader: Allow width smaller than buffer stride in efi_gop Blt()

PATCH In review Ivan Gorinov 2 participants 4 messages Mar 14, 2018

Share & tools

Ivan Gorinov

author

2018-03-14 03:31 UTC #0 lore raw

PATCH 1/1 efi_loader: Allow width smaller than buffer stride in efi_gop Blt()

Current implementation of Blt() in EFI_GRAPHICS_OUTPUT_PROTOCOL assumes the memory buffer stride (number of bytes in a row) always matches the rectangle Width, ignoring non-zero Delta.

Signed-off-by Ivan Gorinov <[email protected]>

---
 lib/efi_loader/efi_gop.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

lib/efi_loader/efi_gop.c +8 -2

index 3caddd5..362065b 100644
@@ -64,6 +64,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 {
 	struct efi_gop_obj *gopobj = container_of(this, struct efi_gop_obj, ops);
 	int i, j, line_len16, line_len32;
+	int buffer_stride;
 	void *fb;
 
 	EFI_ENTRY("%p, %p, %u, %zu, %zu, %zu, %zu, %zu, %zu, %zu", this,

@@ -72,6 +73,11 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 	if (operation != EFI_BLT_BUFFER_TO_VIDEO)
 		return EFI_EXIT(EFI_INVALID_PARAMETER);
 
+	if (delta == 0)
+		buffer_stride = width * sizeof(u32);
+	else
+		buffer_stride = delta;
+
 	fb = gopobj->fb;
 	line_len16 = gopobj->info.width * sizeof(u16);
 	line_len32 = gopobj->info.width * sizeof(u32);

@@ -87,7 +93,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 		for (i = 0; i < height; i++) {
 			u32 *dest = fb + ((i + dy)  * line_len32) +
 					 (dx * sizeof(u32));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
 					 (sx * sizeof(u32));
 
 			/* Same color format, just memcpy */

@@ -102,7 +108,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 		for (i = 0; i < height; i++) {
 			u16 *dest = fb + ((i + dy)  * line_len16) +
 					 (dx * sizeof(u16));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
 					 (sx * sizeof(u32));
 
 			/* Convert from rgb888 to rgb565 */

Signature · 1 line

2.7.4

Heinrich Schuchardt

2018-03-14 15:45 UTC #1 lore raw

Quoted 5 lines · Ivan Gorinov

Current implementation of Blt() in EFI_GRAPHICS_OUTPUT_PROTOCOL assumes the memory buffer stride (number of bytes in a row) always matches the rectangle Width, ignoring non-zero Delta.
Signed-off-by Ivan Gorinov <[email protected]>

Hello Ivan,

thanks for reporting the problem. Unfortunately your patch is not based on the custodian's repository. You can find the upcoming EFI related patches in
https://github.com/agraf/u-boot.git, branch efi-next.

I tried to address your problem in
efi_loader: implement missing bit blit operations in gop
https://lists.denx.de/pipermail/u-boot/2018-February/319846.html

But I think I got it wrong as according to the UEFI specification 'delta' is measured in bytes and not in pixels.

I will create a patch for lib/efi_loader/efi_gop.c and add you on cc. It would be great if you could review efi_gop.c once again.

lib/efi_selftest/efi_selftest_bitblt.c should be adjusted to test the use of 'delta'.

Best regards

Heinrich

Quoted 47 lines

---
  lib/efi_loader/efi_gop.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

lib/efi_loader/efi_gop.c +8 -2

index 3caddd5..362065b 100644
@@ -64,6 +64,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
  {
  	struct efi_gop_obj *gopobj = container_of(this, struct efi_gop_obj, ops);
  	int i, j, line_len16, line_len32;
+	int buffer_stride;
  	void *fb;
 
  	EFI_ENTRY("%p, %p, %u, %zu, %zu, %zu, %zu,the  %zu, %zu, %zu", this,

@@ -72,6 +73,11 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
  	if (operation != EFI_BLT_BUFFER_TO_VIDEO)
  		return EFI_EXIT(EFI_INVALID_PARAMETER);
 
+	if (delta == 0)
+		buffer_stride = width * sizeof(u32);
+	else
+		buffer_stride = delta;
+
  	fb = gopobj->fb;
  	line_len16 = gopobj->info.width * sizeof(u16);
  	line_len32 = gopobj->info.width * sizeof(u32);

@@ -87,7 +93,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
  		for (i = 0; i < height; i++) {
  			u32 *dest = fb + ((i + dy)  * line_len32) +
  					 (dx * sizeof(u32));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
  					 (sx * sizeof(u32));
 
  			/* Same color format, just memcpy */

@@ -102,7 +108,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
  		for (i = 0; i < height; i++) {
  			u16 *dest = fb + ((i + dy)  * line_len16) +
  					 (dx * sizeof(u16));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
  					 (sx * sizeof(u32));
 
  			/* Convert from rgb888 to rgb565 */

Heinrich Schuchardt

2018-03-14 17:21 UTC #2 lore raw

In reply to Ivan Gorinov

Quoted 43 lines · Ivan Gorinov

Current implementation of Blt() in EFI_GRAPHICS_OUTPUT_PROTOCOL assumes the memory buffer stride (number of bytes in a row) always matches the rectangle Width, ignoring non-zero Delta.

Signed-off-by Ivan Gorinov <[email protected]>

---
 lib/efi_loader/efi_gop.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

lib/efi_loader/efi_gop.c +7 -1

index 3caddd5..362065b 100644
@@ -64,6 +64,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 {
 	struct efi_gop_obj *gopobj = container_of(this, struct efi_gop_obj, ops);
 	int i, j, line_len16, line_len32;
+	int buffer_stride;
 	void *fb;
 
 	EFI_ENTRY("%p, %p, %u, %zu, %zu, %zu, %zu, %zu, %zu, %zu", this,

@@ -72,6 +73,11 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 	if (operation != EFI_BLT_BUFFER_TO_VIDEO)
 		return EFI_EXIT(EFI_INVALID_PARAMETER);
 
+	if (delta == 0)
+		buffer_stride = width * sizeof(u32);
+	else
+		buffer_stride = delta;
+
 	fb = gopobj->fb;
 	line_len16 = gopobj->info.width * sizeof(u16);
 	line_len32 = gopobj->info.width * sizeof(u32);

@@ -87,7 +93,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 		for (i = 0; i < height; i++) {
 			u32 *dest = fb + ((i + dy)  * line_len32) +
 					 (dx * sizeof(u32));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
 					 (sx * sizeof(u32));
 
 			/* Same color format, just memcpy */

lib/efi_loader/efi_gop.c efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer, · line 111

Quoted 5 lines

lib/efi_loader/efi_gop.c +1 -1

@@ -102,7 +108,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
 		for (i = 0; i < height; i++) {
 			u16 *dest = fb + ((i + dy)  * line_len16) +
 					 (dx * sizeof(u16));
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +

If delta cannot be divided by 4 a misaligned access error will occur on arm64.

Best regards

Heinrich

Quoted 4 lines

lib/efi_loader/efi_gop.c +0 -0

 					 (sx * sizeof(u32));
 
 			/* Convert from rgb888 to rgb565 */

Ivan Gorinov

author

2018-03-14 18:29 UTC #3 lore raw

On Wed, 2018-03-14 at 18:21 +0100, Heinrich Schuchardt wrote:

@@ -87,7 +93,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void

Quoted 10 lines

Quoted 10 lines
*buffer,
for (i = 0; i < height; i++) {
u32 *dest = fb + ((i + dy) * line_len32) + (dx * sizeof(u32));
(quoted diff) +1 -1
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
(sx * sizeof(u32));
/* Same color format, just memcpy */
(quoted diff) +0 -0
@@ -102,7 +108,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, void

Quoted 8 lines

Review
Quoted 6 lines
(quoted diff) +0 -0
 *buffer,
  		for (i = 0; i < height; i++) {
u16 *dest = fb + ((i + dy) * line_len16) + (dx * sizeof(u16));
(quoted diff) +1 -1
-			u32 *src = buffer + ((i + sy)  * line_len32) +
+			u32 *src = buffer + ((i + sy) * buffer_stride) +
If delta cannot be divided by 4 a misaligned access error will occur on arm64.

This is unlikely because EFI spec allows only 32-bit pixel data in BLT buffer, regardless of actual video frame buffer pixel format.