From: Melissa Wen <melissa....@gmail.com>

[ Upstream commit 0986191186128b10b6bbfa5220fc587ed5725e49 ]

The previous memset operation was not correctly zeroing the alpha
channel to compute the crc, and as a result, the IGT subtest
kms_cursor_crc/pipe-A-cursor-alpha-transparent fails.

Fixes: db7f419c06d7c ("drm/vkms: Compute CRC with Cursor Plane")

Signed-off-by: Melissa Wen <melissa....@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Link: 
https://patchwork.freedesktop.org/patch/msgid/20200730202524.5upzuh4irboru...@smtp.gmail.com
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vkms/vkms_composer.c 
b/drivers/gpu/drm/vkms/vkms_composer.c
index 4af2f19480f4f..b8b060354667e 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -33,7 +33,7 @@ static uint32_t compute_crc(void *vaddr_out, struct 
vkms_composer *composer)
                                     + (i * composer->pitch)
                                     + (j * composer->cpp);
                        /* XRGB format ignores Alpha channel */
-                       memset(vaddr_out + src_offset + 24, 0,  8);
+                       bitmap_clear(vaddr_out + src_offset, 24, 8);
                        crc = crc32_le(crc, vaddr_out + src_offset,
                                       sizeof(u32));
                }
-- 
2.25.1



Reply via email to