UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/format-helper: Remove optional byte-swap from line convertion 

Implement per-pixel byte swapping in a separate conversion helper
for the single function that requires it. Select the correct helper
for each conversion.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220427141409.22842-3-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2022-04-27 16:14:07 +02:00
parent 41fd6f0a6d
commit 69add027fd
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/drm_format_helper.c
View File

@ -229,8 +229,7 @@ void drm_fb_xrgb8888_to_rgb332(void *dst, unsigned int dst_pitch, const void *sr
EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb332); EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb332);
static void drm_fb_xrgb8888_to_rgb565_line(u16 *dbuf, const u32 *sbuf, static void drm_fb_xrgb8888_to_rgb565_line(u16 *dbuf, const u32 *sbuf,
unsigned int pixels, unsigned int pixels)
bool swab)
{ {
unsigned int x; unsigned int x;
u16 val16; u16 val16;
@ -239,10 +238,21 @@ static void drm_fb_xrgb8888_to_rgb565_line(u16 *dbuf, const u32 *sbuf,
val16 = ((sbuf[x] & 0x00F80000) >> 8) | val16 = ((sbuf[x] & 0x00F80000) >> 8) |
((sbuf[x] & 0x0000FC00) >> 5) | ((sbuf[x] & 0x0000FC00) >> 5) |
((sbuf[x] & 0x000000F8) >> 3); ((sbuf[x] & 0x000000F8) >> 3);
if (swab) dbuf[x] = val16;
dbuf[x] = swab16(val16); }
else }
dbuf[x] = val16;
static void drm_fb_xrgb8888_to_rgb565_swab_line(u16 *dbuf, const u32 *sbuf,
unsigned int pixels)
{
unsigned int x;
u16 val16;
for (x = 0; x < pixels; x++) {
val16 = ((sbuf[x] & 0x00F80000) >> 8) |
((sbuf[x] & 0x0000FC00) >> 5) |
((sbuf[x] & 0x000000F8) >> 3);
dbuf[x] = swab16(val16);
} }
} }
@ -282,7 +292,10 @@ void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *va
vaddr += clip_offset(clip, fb->pitches[0], sizeof(u32)); vaddr += clip_offset(clip, fb->pitches[0], sizeof(u32));
for (y = 0; y < lines; y++) { for (y = 0; y < lines; y++) {
memcpy(sbuf, vaddr, src_len); memcpy(sbuf, vaddr, src_len);
drm_fb_xrgb8888_to_rgb565_line(dst, sbuf, linepixels, swab); if (swab)
drm_fb_xrgb8888_to_rgb565_swab_line(dst, sbuf, linepixels);
else
drm_fb_xrgb8888_to_rgb565_line(dst, sbuf, linepixels);
vaddr += fb->pitches[0]; vaddr += fb->pitches[0];
dst += dst_pitch; dst += dst_pitch;
} }
@ -321,7 +334,10 @@ void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
vaddr += clip_offset(clip, fb->pitches[0], sizeof(u32)); vaddr += clip_offset(clip, fb->pitches[0], sizeof(u32));
for (y = 0; y < lines; y++) { for (y = 0; y < lines; y++) {
drm_fb_xrgb8888_to_rgb565_line(dbuf, vaddr, linepixels, swab); if (swab)
drm_fb_xrgb8888_to_rgb565_swab_line(dbuf, vaddr, linepixels);
else
drm_fb_xrgb8888_to_rgb565_line(dbuf, vaddr, linepixels);
memcpy_toio(dst, dbuf, dst_len); memcpy_toio(dst, dbuf, dst_len);
vaddr += fb->pitches[0]; vaddr += fb->pitches[0];
dst += dst_pitch; dst += dst_pitch;