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

drm/gud: Fix endianness in gud_xrgb8888_to_color() helper 

DRM formats are defined to be little-endian, unless the
DRM_FORMAT_BIG_ENDIAN flag is set.  Hence when converting from one
format to another, multi-byte pixel values loaded from memory must be
converted from little-endian to host-endian.  Conversely, multi-byte
pixel values written to memory must be converted from host-endian to
little-endian.  Currently only drm_fb_xrgb8888_to_rgb332_line() includes
endianness handling.

Fix gud_xrgb8888_to_color() on big-endian platforms by adding the
missing endianness handling.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/b47589ed5d8ca44e0956684412e3f16f3227f887.1657300532.git.geert@linux-m68k.org
This commit is contained in:
Geert Uytterhoeven 2022-07-08 20:21:09 +02:00 committed by Noralf Trønnes
parent 4d9db10576
commit fa2a87e4c5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/gud/gud_pipe.c
View File

@ -105,7 +105,8 @@ static size_t gud_xrgb8888_to_color(u8 *dst, const struct drm_format_info *forma
unsigned int bits_per_pixel = 8 / block_width; unsigned int bits_per_pixel = 8 / block_width;
u8 r, g, b, pix, *block = dst; /* Assign to silence compiler warning */ u8 r, g, b, pix, *block = dst; /* Assign to silence compiler warning */
unsigned int x, y, width; unsigned int x, y, width;
u32 *pix32; __le32 *sbuf32;
u32 pix32;
size_t len; size_t len;
/* Start on a byte boundary */ /* Start on a byte boundary */
@ -114,8 +115,8 @@ static size_t gud_xrgb8888_to_color(u8 *dst, const struct drm_format_info *forma
len = drm_format_info_min_pitch(format, 0, width) * drm_rect_height(rect); len = drm_format_info_min_pitch(format, 0, width) * drm_rect_height(rect);
for (y = rect->y1; y < rect->y2; y++) { for (y = rect->y1; y < rect->y2; y++) {
pix32 = src + (y * fb->pitches[0]); sbuf32 = src + (y * fb->pitches[0]);
pix32 += rect->x1; sbuf32 += rect->x1;
for (x = 0; x < width; x++) { for (x = 0; x < width; x++) {
unsigned int pixpos = x % block_width; /* within byte from the left */ unsigned int pixpos = x % block_width; /* within byte from the left */
@ -126,9 +127,10 @@ static size_t gud_xrgb8888_to_color(u8 *dst, const struct drm_format_info *forma
*block = 0; *block = 0;
} }
r = *pix32 >> 16; pix32 = le32_to_cpu(*sbuf32++);
g = *pix32 >> 8; r = pix32 >> 16;
b = *pix32++; g = pix32 >> 8;
b = pix32;
switch (format->format) { switch (format->format) {
case GUD_DRM_FORMAT_XRGB1111: case GUD_DRM_FORMAT_XRGB1111: