Commit 04b3924d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: Redefine pixel formats 



Name the formats as DRM_FORMAT_X instead of DRM_FOURCC_X. Use consistent
names, especially for the RGB formats. Component order and byte order are
now strictly specified for each format.

The RGB format naming follows a convention where the components names
and sizes are listed from left to right, matching the order within a
single pixel from most significant bit to least significant bit.

The YUV format names vary more. For the 4:2:2 packed formats and 2
plane formats use the fourcc. For the three plane formats the
name includes the plane order and subsampling information using the
standard subsampling notation. Some of those also happen to match
the official fourcc definition.

The fourccs for for all the RGB formats and some of the YUV formats
I invented myself. The idea was that looking at just the fourcc you
get some idea what the format is about without having to decode it
using some external reference.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 248dbc23

drivers/gpu/drm/drm_crtc.c

+42 −15
Original line number Diff line number Diff line
@@ -1923,28 +1923,28 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth) 


	switch (bpp) {

	case 8:

		fmt = DRM_FOURCC_RGB332;

		fmt = DRM_FORMAT_RGB332;

		break;

	case 16:

		if (depth == 15)

			fmt = DRM_FOURCC_RGB555;

			fmt = DRM_FORMAT_XRGB1555;

		else

			fmt = DRM_FOURCC_RGB565;

			fmt = DRM_FORMAT_RGB565;

		break;

	case 24:

		fmt = DRM_FOURCC_RGB24;

		fmt = DRM_FORMAT_RGB888;

		break;

	case 32:

		if (depth == 24)

			fmt = DRM_FOURCC_RGB24;

			fmt = DRM_FORMAT_XRGB8888;

		else if (depth == 30)

			fmt = DRM_INTEL_RGB30;

			fmt = DRM_FORMAT_XRGB2101010;

		else

			fmt = DRM_FOURCC_RGB32;

			fmt = DRM_FORMAT_ARGB8888;

		break;

	default:

		DRM_ERROR("bad bpp, assuming RGB24 pixel format\n");

		fmt = DRM_FOURCC_RGB24;

		DRM_ERROR("bad bpp, assuming x8r8g8b8 pixel format\n");

		fmt = DRM_FORMAT_XRGB8888;

		break;

	}
@@ -3145,27 +3145,54 @@ void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth, 
			  int *bpp)

{

	switch (format) {

	case DRM_FOURCC_RGB332:

	case DRM_FORMAT_RGB332:

	case DRM_FORMAT_BGR233:

		*depth = 8;

		*bpp = 8;

		break;

	case DRM_FOURCC_RGB555:

	case DRM_FORMAT_XRGB1555:

	case DRM_FORMAT_XBGR1555:

	case DRM_FORMAT_RGBX5551:

	case DRM_FORMAT_BGRX5551:

	case DRM_FORMAT_ARGB1555:

	case DRM_FORMAT_ABGR1555:

	case DRM_FORMAT_RGBA5551:

	case DRM_FORMAT_BGRA5551:

		*depth = 15;

		*bpp = 16;

		break;

	case DRM_FOURCC_RGB565:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_BGR565:

		*depth = 16;

		*bpp = 16;

		break;

	case DRM_FOURCC_RGB24:

	case DRM_FORMAT_RGB888:

	case DRM_FORMAT_BGR888:

		*depth = 24;

		*bpp = 24;

		break;

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_RGBX8888:

	case DRM_FORMAT_BGRX8888:

		*depth = 24;

		*bpp = 32;

		break;

	case DRM_INTEL_RGB30:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_RGBX1010102:

	case DRM_FORMAT_BGRX1010102:

	case DRM_FORMAT_ARGB2101010:

	case DRM_FORMAT_ABGR2101010:

	case DRM_FORMAT_RGBA1010102:

	case DRM_FORMAT_BGRA1010102:

		*depth = 30;

		*bpp = 32;

		break;

	case DRM_FOURCC_RGB32:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ABGR8888:

	case DRM_FORMAT_RGBA8888:

	case DRM_FORMAT_BGRA8888:

		*depth = 32;

		*bpp = 32;

		break;

drivers/gpu/drm/i915/intel_display.c

+10 −8
Original line number Diff line number Diff line
@@ -7585,16 +7585,18 @@ int intel_framebuffer_init(struct drm_device *dev, 
		return -EINVAL;



	switch (mode_cmd->pixel_format) {

	case DRM_FOURCC_RGB332:

	case DRM_FOURCC_RGB565:

	case DRM_FOURCC_RGB24:

	case DRM_INTEL_RGB30:

	case DRM_FORMAT_RGB332:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_ARGB2101010:

		/* RGB formats are common across chipsets */

		break;

	case DRM_FOURCC_YUYV:

	case DRM_FOURCC_UYVY:

	case DRM_FOURCC_YVYU:

	case DRM_FOURCC_VYUY:

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_YVYU:

	case DRM_FORMAT_VYUY:

		break;

	default:

		DRM_ERROR("unsupported pixel format\n");

include/drm/drm_fourcc.h

+94 −27
Original line number Diff line number Diff line
@@ -24,40 +24,107 @@ 
#ifndef DRM_FOURCC_H

#define DRM_FOURCC_H



/*

 * We don't use the V4L header because

 * 1) the fourcc codes are well defined and trivial to construct

 * 2) we don't want user apps to have to pull in v4l headers just for fourcc

 * 3) the v4l fourcc codes are mixed up with a bunch of other code and are

 *    part of the v4l API, so changing them to something linux-generic isn't

 *    feasible

 *

 * So the below includes the fourcc codes used by the DRM and its drivers,

 * along with potential device specific codes.

 */



#include <linux/types.h>



#define fourcc_code(a,b,c,d) ((u32)(a) | ((u32)(b) << 8) | \

			      ((u32)(c) << 16) | ((u32)(d) << 24))



/* RGB codes */

#define DRM_FOURCC_RGB332 fourcc_code('R','G','B','1')

#define DRM_FOURCC_RGB555 fourcc_code('R','G','B','O')

#define DRM_FOURCC_RGB565 fourcc_code('R','G','B','P')

#define DRM_FOURCC_RGB24  fourcc_code('R','G','B','3')

#define DRM_FOURCC_RGB32  fourcc_code('R','G','B','4')

#define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */



/* color index */

#define DRM_FORMAT_C8		fourcc_code('C', '8', ' ', ' ') /* [7:0] C */



/* 8 bpp RGB */

#define DRM_FORMAT_RGB332	fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */

#define DRM_FORMAT_BGR233	fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */



/* 16 bpp RGB */

#define DRM_FORMAT_XRGB4444	fourcc_code('X', 'R', '1', '2') /* [15:0] x:R:G:B 4:4:4:4 little endian */

#define DRM_FORMAT_XBGR4444	fourcc_code('X', 'B', '1', '2') /* [15:0] x:B:G:R 4:4:4:4 little endian */

#define DRM_FORMAT_RGBX4444	fourcc_code('R', 'X', '1', '2') /* [15:0] R:G:B:x 4:4:4:4 little endian */

#define DRM_FORMAT_BGRX4444	fourcc_code('B', 'X', '1', '2') /* [15:0] B:G:R:x 4:4:4:4 little endian */



#define DRM_FORMAT_ARGB4444	fourcc_code('A', 'R', '1', '2') /* [15:0] A:R:G:B 4:4:4:4 little endian */

#define DRM_FORMAT_ABGR4444	fourcc_code('A', 'B', '1', '2') /* [15:0] A:B:G:R 4:4:4:4 little endian */

#define DRM_FORMAT_RGBA4444	fourcc_code('R', 'A', '1', '2') /* [15:0] R:G:B:A 4:4:4:4 little endian */

#define DRM_FORMAT_BGRA4444	fourcc_code('B', 'A', '1', '2') /* [15:0] B:G:R:A 4:4:4:4 little endian */



#define DRM_FORMAT_XRGB1555	fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */

#define DRM_FORMAT_XBGR1555	fourcc_code('X', 'B', '1', '5') /* [15:0] x:B:G:R 1:5:5:5 little endian */

#define DRM_FORMAT_RGBX5551	fourcc_code('R', 'X', '1', '5') /* [15:0] R:G:B:x 5:5:5:1 little endian */

#define DRM_FORMAT_BGRX5551	fourcc_code('B', 'X', '1', '5') /* [15:0] B:G:R:x 5:5:5:1 little endian */



#define DRM_FORMAT_ARGB1555	fourcc_code('A', 'R', '1', '5') /* [15:0] A:R:G:B 1:5:5:5 little endian */

#define DRM_FORMAT_ABGR1555	fourcc_code('A', 'B', '1', '5') /* [15:0] A:B:G:R 1:5:5:5 little endian */

#define DRM_FORMAT_RGBA5551	fourcc_code('R', 'A', '1', '5') /* [15:0] R:G:B:A 5:5:5:1 little endian */

#define DRM_FORMAT_BGRA5551	fourcc_code('B', 'A', '1', '5') /* [15:0] B:G:R:A 5:5:5:1 little endian */



#define DRM_FORMAT_RGB565	fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */

#define DRM_FORMAT_BGR565	fourcc_code('B', 'G', '1', '6') /* [15:0] B:G:R 5:6:5 little endian */



#define DRM_FOURCC_BGR24  fourcc_code('B','G','R','3')

#define DRM_FOURCC_BGR32  fourcc_code('B','G','R','4')

/* 24 bpp RGB */

#define DRM_FORMAT_RGB888	fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */

#define DRM_FORMAT_BGR888	fourcc_code('B', 'G', '2', '4') /* [23:0] B:G:R little endian */



/* YUV codes */

#define DRM_FOURCC_YUYV   fourcc_code('Y', 'U', 'Y', 'V')

#define DRM_FOURCC_YVYU   fourcc_code('Y', 'V', 'Y', 'U')

#define DRM_FOURCC_UYVY   fourcc_code('U', 'Y', 'V', 'Y')

#define DRM_FOURCC_VYUY   fourcc_code('V', 'Y', 'U', 'Y')

/* 32 bpp RGB */

#define DRM_FORMAT_XRGB8888	fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */

#define DRM_FORMAT_XBGR8888	fourcc_code('X', 'B', '2', '4') /* [31:0] x:B:G:R 8:8:8:8 little endian */

#define DRM_FORMAT_RGBX8888	fourcc_code('R', 'X', '2', '4') /* [31:0] R:G:B:x 8:8:8:8 little endian */

#define DRM_FORMAT_BGRX8888	fourcc_code('B', 'X', '2', '4') /* [31:0] B:G:R:x 8:8:8:8 little endian */



/* DRM specific codes */

#define DRM_INTEL_RGB30   fourcc_code('R','G','B','0') /* RGB x:10:10:10 */

#define DRM_FORMAT_ARGB8888	fourcc_code('A', 'R', '2', '4') /* [31:0] A:R:G:B 8:8:8:8 little endian */

#define DRM_FORMAT_ABGR8888	fourcc_code('A', 'B', '2', '4') /* [31:0] A:B:G:R 8:8:8:8 little endian */

#define DRM_FORMAT_RGBA8888	fourcc_code('R', 'A', '2', '4') /* [31:0] R:G:B:A 8:8:8:8 little endian */

#define DRM_FORMAT_BGRA8888	fourcc_code('B', 'A', '2', '4') /* [31:0] B:G:R:A 8:8:8:8 little endian */



#define DRM_FORMAT_XRGB2101010	fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */

#define DRM_FORMAT_XBGR2101010	fourcc_code('X', 'B', '3', '0') /* [31:0] x:B:G:R 2:10:10:10 little endian */

#define DRM_FORMAT_RGBX1010102	fourcc_code('R', 'X', '3', '0') /* [31:0] R:G:B:x 10:10:10:2 little endian */

#define DRM_FORMAT_BGRX1010102	fourcc_code('B', 'X', '3', '0') /* [31:0] B:G:R:x 10:10:10:2 little endian */



#define DRM_FORMAT_ARGB2101010	fourcc_code('A', 'R', '3', '0') /* [31:0] A:R:G:B 2:10:10:10 little endian */

#define DRM_FORMAT_ABGR2101010	fourcc_code('A', 'B', '3', '0') /* [31:0] A:B:G:R 2:10:10:10 little endian */

#define DRM_FORMAT_RGBA1010102	fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */

#define DRM_FORMAT_BGRA1010102	fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */



/* packed YCbCr */

#define DRM_FORMAT_YUYV		fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */

#define DRM_FORMAT_YVYU		fourcc_code('Y', 'V', 'Y', 'U') /* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */

#define DRM_FORMAT_UYVY		fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */

#define DRM_FORMAT_VYUY		fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */



#define DRM_FORMAT_AYUV		fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */



/*

 * 2 plane YCbCr

 * index 0 = Y plane, [7:0] Y

 * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian

 * or

 * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian

 */

#define DRM_FORMAT_NV12		fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */

#define DRM_FORMAT_NV21		fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */

#define DRM_FORMAT_NV16		fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */

#define DRM_FORMAT_NV61		fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */



/*

 * 3 plane YCbCr

 * index 0: Y plane, [7:0] Y

 * index 1: Cb plane, [7:0] Cb

 * index 2: Cr plane, [7:0] Cr

 * or

 * index 1: Cr plane, [7:0] Cr

 * index 2: Cb plane, [7:0] Cb

 */

#define DRM_FORMAT_YUV410	fourcc_code('Y', 'U', 'V', '9') /* 4x4 subsampled Cb (1) and Cr (2) planes */

#define DRM_FORMAT_YVU410	fourcc_code('Y', 'V', 'U', '9') /* 4x4 subsampled Cr (1) and Cb (2) planes */

#define DRM_FORMAT_YUV411	fourcc_code('Y', 'U', '1', '1') /* 4x1 subsampled Cb (1) and Cr (2) planes */

#define DRM_FORMAT_YVU411	fourcc_code('Y', 'V', '1', '1') /* 4x1 subsampled Cr (1) and Cb (2) planes */

#define DRM_FORMAT_YUV420	fourcc_code('Y', 'U', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes */

#define DRM_FORMAT_YVU420	fourcc_code('Y', 'V', '1', '2') /* 2x2 subsampled Cr (1) and Cb (2) planes */

#define DRM_FORMAT_YUV422	fourcc_code('Y', 'U', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes */

#define DRM_FORMAT_YVU422	fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */

#define DRM_FORMAT_YUV444	fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */

#define DRM_FORMAT_YVU444	fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */



#endif /* DRM_FOURCC_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE