drm: xilinx: drv: Fix the format descriptor

Fix the Xilinx RGB format to be 24 bit RGB format, and add one more descriptor
for XRGB format with 24 bit depth and 32 bit pixel.

Signed-off-by: Hyun Kwon <hyunk@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_drv.c b/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
index 431dcf7fc439a1c975deb4ec00ab442670c6fb58..a20afb3612dedcca70927ce7bf196f17d183d662 100644 (file)
--- a/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
+++ b/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
@@ -70,8 +70,9 @@ struct xilinx_video_format_desc {
 static const struct xilinx_video_format_desc xilinx_video_formats[] = {
        { "yuv422", 16, 16, XILINX_VIDEO_FORMAT_YUV422, DRM_FORMAT_YUYV },
        { "yuv444", 24, 24, XILINX_VIDEO_FORMAT_YUV444, DRM_FORMAT_YUV444 },
-       { "xrgb888", 24, 32, XILINX_VIDEO_FORMAT_RGB, DRM_FORMAT_XRGB8888 },
+       { "rgb888", 24, 24, XILINX_VIDEO_FORMAT_RGB, DRM_FORMAT_RGB888 },
        { "yuv420", 16, 16, XILINX_VIDEO_FORMAT_YUV420, DRM_FORMAT_YUV420 },
+       { "xrgb8888", 24, 32, XILINX_VIDEO_FORMAT_XRGB, DRM_FORMAT_XRGB8888 },
 };
 
 static unsigned int xilinx_drm_format_bpp(uint32_t drm_format);

diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_drv.h b/drivers/gpu/drm/xilinx/xilinx_drm_drv.h
index d88e93bc4d1a115b9786f48f6f34e447eab886eb..11aedd76f14ff617733d83133933737332beb001 100644 (file)
--- a/drivers/gpu/drm/xilinx/xilinx_drm_drv.h
+++ b/drivers/gpu/drm/xilinx/xilinx_drm_drv.h
@@ -23,6 +23,7 @@ enum xilinx_video_format {
        XILINX_VIDEO_FORMAT_YUV444 = 1,
        XILINX_VIDEO_FORMAT_RGB = 2,
        XILINX_VIDEO_FORMAT_YUV420 = 3,
+       XILINX_VIDEO_FORMAT_XRGB = 16,
 };
 
 /* convert the xilinx format to the drm format */