On 1/3/23 22:50, Alexander Graf wrote:
Now that we have a damage tracking API, let's populate damage done by UEFI payloads when they BLT data onto the screen.
Signed-off-by: Alexander Graf agraf@csgraf.de Reported-by: Da Xue da@libre.computer
v1 -> v2:
- Remove ifdefs from gop
v2 -> v3:
- Adapt to always assume DM is used
v3 -> v4:
- Skip damage on EfiBltVideoToBltBuffer
lib/efi_loader/efi_gop.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index d1dc2f22d0..425dcbf6b1 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -32,6 +32,7 @@ struct efi_gop_obj { struct efi_gop ops; struct efi_gop_mode_info info; struct efi_gop_mode mode;
- struct udevice *vdev; /* Fields we only have access to during init */ u32 bpix; void *fb;
@@ -120,6 +121,7 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, u32 *fb32 = gopobj->fb; u16 *fb16 = gopobj->fb; struct efi_gop_pixel *buffer = __builtin_assume_aligned(bufferp, 4);
- bool blt_to_video = (operation != EFI_BLT_VIDEO_TO_BLT_BUFFER);
Using a variable is not really necessary but it could make the code more accessible to readers.
Reviewed-by: Heinrich Schuchardt xypron.glpk@gmx.de
if (delta) { /* Check for 4 byte alignment */ @@ -243,6 +245,9 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, dlineoff += dwidth; }
- if (blt_to_video)
video_damage(gopobj->vdev, dx, dy, width, height);- return EFI_SUCCESS; }
@@ -547,6 +552,7 @@ efi_status_t efi_gop_register(void) gopobj->info.pixels_per_scanline = col; gopobj->bpix = bpix; gopobj->fb = fb;
gopobj->vdev = vdev;
return EFI_SUCCESS; }