From: Alexander Graf <ag...@csgraf.de>

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 <ag...@csgraf.de>
Reported-by: Da Xue <da@libre.computer>
Reviewed-by: Heinrich Schuchardt <xypron.g...@gmx.de>
[Alper: Add struct comment for new member]
Signed-off-by: Alper Nebi Yasak <alpernebiya...@gmail.com>
---

Changes in v5:
- Document new vdev field in struct efi_gop_obj comment

Changes in v4:
- Skip damage on EfiBltVideoToBltBuffer

Changes in v3:
- Adapt to always assume DM is used

Changes in v2:
- Remove ifdefs from gop

 lib/efi_loader/efi_gop.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 778b693f983a..db6535e080c4 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -24,6 +24,7 @@ static const efi_guid_t efi_gop_guid = 
EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
  * @ops:       graphical output protocol interface
  * @info:      graphical output mode information
  * @mode:      graphical output mode
+ * @vdev:      backing video device
  * @bpix:      bits per pixel
  * @fb:                frame buffer
  */
@@ -32,6 +33,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 +122,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);
 
        if (delta) {
                /* Check for 4 byte alignment */
@@ -243,6 +246,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;
 }
 
@@ -548,6 +554,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;
 }
-- 
2.40.1

Reply via email to