* [PATCH] drm/vkms: fix xrgb on compute crc
@ 2020-07-30 20:25 ` Melissa Wen
0 siblings, 0 replies; 4+ messages in thread
From: Melissa Wen @ 2020-07-30 20:25 UTC (permalink / raw)
To: Rodrigo Siqueira, Haneen Mohammed, Daniel Vetter, David Airlie,
Rodrigo Siqueira
Cc: twoerner, dri-devel, linux-kernel, kernel-usp
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(-)
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));
}
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] drm/vkms: fix xrgb on compute crc
@ 2020-07-30 20:25 ` Melissa Wen
0 siblings, 0 replies; 4+ messages in thread
From: Melissa Wen @ 2020-07-30 20:25 UTC (permalink / raw)
To: Rodrigo Siqueira, Haneen Mohammed, Daniel Vetter, David Airlie,
Rodrigo Siqueira
Cc: kernel-usp, linux-kernel, dri-devel
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(-)
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));
}
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/vkms: fix xrgb on compute crc
2020-07-30 20:25 ` Melissa Wen
@ 2020-07-31 9:28 ` daniel
-1 siblings, 0 replies; 4+ messages in thread
From: daniel @ 2020-07-31 9:28 UTC (permalink / raw)
Cc: Rodrigo Siqueira, Haneen Mohammed, Daniel Vetter, David Airlie,
Rodrigo Siqueira, twoerner, dri-devel, linux-kernel, kernel-usp
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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/vkms: fix xrgb on compute crc
@ 2020-07-31 9:28 ` daniel
0 siblings, 0 replies; 4+ messages in thread
From: daniel @ 2020-07-31 9:28 UTC (permalink / raw)
Cc: Haneen Mohammed, Rodrigo Siqueira, David Airlie,
Rodrigo Siqueira, linux-kernel, dri-devel, kernel-usp
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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-31 9:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-30 20:25 [PATCH] drm/vkms: fix xrgb on compute crc Melissa Wen
2020-07-30 20:25 ` Melissa Wen
2020-07-31 9:28 ` daniel
2020-07-31 9:28 ` daniel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.