aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-05-18 17:47:40 -0400
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-09-18 06:28:21 -0400
commitba623f6a5a419ac31806e77682da38a9f9b5b462 (patch)
tree51cdc671993fdd5e82409557ba333f05d42ecbe6
parent2e3b3c42f06ff6801b3d7839757bbdb231619083 (diff)
drm: Add NV24 and NV42 pixel formats
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--drivers/gpu/drm/drm_crtc.c6
-rw-r--r--include/drm/drm_fourcc.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 08a7aa722d6b..28d0900d7f89 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2169,6 +2169,8 @@ static int format_check(const struct drm_mode_fb_cmd2 *r)
2169 case DRM_FORMAT_NV21: 2169 case DRM_FORMAT_NV21:
2170 case DRM_FORMAT_NV16: 2170 case DRM_FORMAT_NV16:
2171 case DRM_FORMAT_NV61: 2171 case DRM_FORMAT_NV61:
2172 case DRM_FORMAT_NV24:
2173 case DRM_FORMAT_NV42:
2172 case DRM_FORMAT_YUV410: 2174 case DRM_FORMAT_YUV410:
2173 case DRM_FORMAT_YVU410: 2175 case DRM_FORMAT_YVU410:
2174 case DRM_FORMAT_YUV411: 2176 case DRM_FORMAT_YUV411:
@@ -3718,6 +3720,8 @@ int drm_format_num_planes(uint32_t format)
3718 case DRM_FORMAT_NV21: 3720 case DRM_FORMAT_NV21:
3719 case DRM_FORMAT_NV16: 3721 case DRM_FORMAT_NV16:
3720 case DRM_FORMAT_NV61: 3722 case DRM_FORMAT_NV61:
3723 case DRM_FORMAT_NV24:
3724 case DRM_FORMAT_NV42:
3721 return 2; 3725 return 2;
3722 default: 3726 default:
3723 return 1; 3727 return 1;
@@ -3751,6 +3755,8 @@ int drm_format_plane_cpp(uint32_t format, int plane)
3751 case DRM_FORMAT_NV21: 3755 case DRM_FORMAT_NV21:
3752 case DRM_FORMAT_NV16: 3756 case DRM_FORMAT_NV16:
3753 case DRM_FORMAT_NV61: 3757 case DRM_FORMAT_NV61:
3758 case DRM_FORMAT_NV24:
3759 case DRM_FORMAT_NV42:
3754 return plane ? 2 : 1; 3760 return plane ? 2 : 1;
3755 case DRM_FORMAT_YUV410: 3761 case DRM_FORMAT_YUV410:
3756 case DRM_FORMAT_YVU410: 3762 case DRM_FORMAT_YVU410:
diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
index bdf0152cbbe9..fac7235281f1 100644
--- a/include/drm/drm_fourcc.h
+++ b/include/drm/drm_fourcc.h
@@ -106,6 +106,8 @@
106#define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ 106#define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */
107#define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ 107#define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */
108#define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ 108#define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */
109#define DRM_FORMAT_NV24 fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
110#define DRM_FORMAT_NV42 fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
109 111
110/* 2 non contiguous plane YCbCr */ 112/* 2 non contiguous plane YCbCr */
111#define DRM_FORMAT_NV12M fourcc_code('N', 'M', '1', '2') /* 2x2 subsampled Cr:Cb plane */ 113#define DRM_FORMAT_NV12M fourcc_code('N', 'M', '1', '2') /* 2x2 subsampled Cr:Cb plane */