| Message ID | 20200730202524.5upzuh4irboru7my@smtp.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vkms: fix xrgb on compute crc | expand |
On Thu, Jul 30, 2020 at 05:25:24PM -0300, Melissa Wen wrote: > 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.srw@gmail.com> Applied to drm-misc-next, thanks for your patch. > --- > 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 4af2f19480f4..b8b060354667 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); Yeah that's a pretty good "oops" oversight on review, nice catch! Cheers, Daniel > crc = crc32_le(crc, vaddr_out + src_offset, > sizeof(u32)); > } > -- > 2.27.0 >
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 4af2f19480f4..b8b060354667 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)); }
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.srw@gmail.com> --- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)