[v2,1/3] drm: Add some new format DRM_FORMAT_NVXX_10
diff mbox series

Message ID 1569486289-152061-2-git-send-email-hjc@rock-chips.com
State New
Headers show
Series
  • Add some yuv 10bit support
Related show

Commit Message

sandy.huang Sept. 26, 2019, 8:24 a.m. UTC
These new format is supported by some rockchip socs:

DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
---
 drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
 include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

Comments

james qian wang (Arm Technology China) Sept. 29, 2019, 3:26 a.m. UTC | #1
On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> These new format is supported by some rockchip socs:
> 
> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> 
> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> ---
>  drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>  include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>  2 files changed, 32 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index c630064..ccd78a3 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
>  		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
>  		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
>  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },

Hi Sandy:

Their is a problem here for char_per_block size of plane[0]:

Since: 5 * 8 != 4 * 4 * 10;

Seems you mis-set the block_w/h, per your block size the block is 2x2, and it should be:

 .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2, 2, 0 },


Best Regards:
James

> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>  		{ .format = DRM_FORMAT_P210,		.depth = 0,
>  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
>  		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> index 3feeaa3..08e2221 100644
> --- a/include/uapi/drm/drm_fourcc.h
> +++ b/include/uapi/drm/drm_fourcc.h
> @@ -238,6 +238,20 @@ extern "C" {
>  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>  
>  /*
> + * 2 plane YCbCr
> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> + * or
> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> + */
> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> +
> +/*
>   * 2 plane YCbCr MSB aligned
>   * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>   * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
Ville Syrjälä Sept. 30, 2019, 10:48 a.m. UTC | #2
On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> These new format is supported by some rockchip socs:
> 
> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> 
> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> ---
>  drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>  include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>  2 files changed, 32 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index c630064..ccd78a3 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
>  		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
>  		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
>  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>  		{ .format = DRM_FORMAT_P210,		.depth = 0,
>  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
>  		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> index 3feeaa3..08e2221 100644
> --- a/include/uapi/drm/drm_fourcc.h
> +++ b/include/uapi/drm/drm_fourcc.h
> @@ -238,6 +238,20 @@ extern "C" {
>  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>  
>  /*
> + * 2 plane YCbCr
> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> + * or
> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10

So now you're defining it as some kind of byte aligned block.
With that specifying endianness would now make sense since
otherwise this tells us absolutely nothing about the memory
layout.

So I'd either do that, or go back to not specifying anything and
use some weasel words like "mamory layout is implementation defined"
which of course means no one can use it for anything that involves
any kind of cross vendor stuff.

> + */
> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> +
> +/*
>   * 2 plane YCbCr MSB aligned
>   * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>   * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
> -- 
> 2.7.4
> 
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
sandy.huang Oct. 8, 2019, 2:40 a.m. UTC | #3
Hi ville syrjala,

在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>> These new format is supported by some rockchip socs:
>>
>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>
>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>> ---
>>   drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>   include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>   2 files changed, 32 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
>> index c630064..ccd78a3 100644
>> --- a/drivers/gpu/drm/drm_fourcc.c
>> +++ b/drivers/gpu/drm/drm_fourcc.c
>> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
>>   		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
>>   		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
>>   		  .hsub = 2, .vsub = 2, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>>   		{ .format = DRM_FORMAT_P210,		.depth = 0,
>>   		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>   		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
>> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
>> index 3feeaa3..08e2221 100644
>> --- a/include/uapi/drm/drm_fourcc.h
>> +++ b/include/uapi/drm/drm_fourcc.h
>> @@ -238,6 +238,20 @@ extern "C" {
>>   #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>>   
>>   /*
>> + * 2 plane YCbCr
>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
>> + * or
>> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> So now you're defining it as some kind of byte aligned block.
> With that specifying endianness would now make sense since
> otherwise this tells us absolutely nothing about the memory
> layout.
>
> So I'd either do that, or go back to not specifying anything and
> use some weasel words like "mamory layout is implementation defined"
> which of course means no one can use it for anything that involves
> any kind of cross vendor stuff.
/*
  * 2 plane YCbCr
  * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10  little endian
  * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 
10:10:10:10:10:10:10:10  little endian
  * or
  * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 
10:10:10:10:10:10:10:10  little endian
  */

Is this description ok?

>> + */
>> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
>> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
>> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
>> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
>> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
>> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
>> +
>> +/*
>>    * 2 plane YCbCr MSB aligned
>>    * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>    * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
>> -- 
>> 2.7.4
>>
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ville Syrjälä Oct. 8, 2019, 11:33 a.m. UTC | #4
On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> Hi ville syrjala,
> 
> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> >> These new format is supported by some rockchip socs:
> >>
> >> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> >> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> >> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> >>
> >> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> >> ---
> >>   drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> >>   include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> >>   2 files changed, 32 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> >> index c630064..ccd78a3 100644
> >> --- a/drivers/gpu/drm/drm_fourcc.c
> >> +++ b/drivers/gpu/drm/drm_fourcc.c
> >> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
> >>   		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
> >>   		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
> >>   		  .hsub = 2, .vsub = 2, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> >> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> >> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> >> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> >>   		{ .format = DRM_FORMAT_P210,		.depth = 0,
> >>   		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
> >>   		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> >> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> >> index 3feeaa3..08e2221 100644
> >> --- a/include/uapi/drm/drm_fourcc.h
> >> +++ b/include/uapi/drm/drm_fourcc.h
> >> @@ -238,6 +238,20 @@ extern "C" {
> >>   #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
> >>   
> >>   /*
> >> + * 2 plane YCbCr
> >> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> >> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> >> + * or
> >> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > So now you're defining it as some kind of byte aligned block.
> > With that specifying endianness would now make sense since
> > otherwise this tells us absolutely nothing about the memory
> > layout.
> >
> > So I'd either do that, or go back to not specifying anything and
> > use some weasel words like "mamory layout is implementation defined"
> > which of course means no one can use it for anything that involves
> > any kind of cross vendor stuff.
> /*
>   * 2 plane YCbCr
>   * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10  little endian
>   * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 
> 10:10:10:10:10:10:10:10  little endian
>   * or
>   * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 
> 10:10:10:10:10:10:10:10  little endian
>   */
> 
> Is this description ok?

Seems OK to me, if it actually describes the format correctly.

Though I'm not sure why the CbCr is defines as an 80bit block
and Y has a 40bit block. 40bits should be enough for CbCr as well.

> 
> >> + */
> >> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> >> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> >> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> >> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> >> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> >> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> >> +
> >> +/*
> >>    * 2 plane YCbCr MSB aligned
> >>    * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> >>    * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
> >> -- 
> >> 2.7.4
> >>
> >>
> >>
> >> _______________________________________________
> >> dri-devel mailing list
> >> dri-devel@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
sandy.huang Oct. 8, 2019, 11:49 a.m. UTC | #5
在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
>> Hi ville syrjala,
>>
>> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
>>> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>>>> These new format is supported by some rockchip socs:
>>>>
>>>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>>>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>>>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>>>
>>>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>>>> ---
>>>>    drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>>>    include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>>>    2 files changed, 32 insertions(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
>>>> index c630064..ccd78a3 100644
>>>> --- a/drivers/gpu/drm/drm_fourcc.c
>>>> +++ b/drivers/gpu/drm/drm_fourcc.c
>>>> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
>>>>    		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
>>>>    		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
>>>>    		  .hsub = 2, .vsub = 2, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>>>> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
>>>> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>    		{ .format = DRM_FORMAT_P210,		.depth = 0,
>>>>    		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>>>    		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
>>>> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
>>>> index 3feeaa3..08e2221 100644
>>>> --- a/include/uapi/drm/drm_fourcc.h
>>>> +++ b/include/uapi/drm/drm_fourcc.h
>>>> @@ -238,6 +238,20 @@ extern "C" {
>>>>    #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>>>>    
>>>>    /*
>>>> + * 2 plane YCbCr
>>>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>>>> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
>>>> + * or
>>>> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
>>> So now you're defining it as some kind of byte aligned block.
>>> With that specifying endianness would now make sense since
>>> otherwise this tells us absolutely nothing about the memory
>>> layout.
>>>
>>> So I'd either do that, or go back to not specifying anything and
>>> use some weasel words like "mamory layout is implementation defined"
>>> which of course means no one can use it for anything that involves
>>> any kind of cross vendor stuff.
>> /*
>>    * 2 plane YCbCr
>>    * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10  little endian
>>    * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
>> 10:10:10:10:10:10:10:10  little endian
>>    * or
>>    * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
>> 10:10:10:10:10:10:10:10  little endian
>>    */
>>
>> Is this description ok?
> Seems OK to me, if it actually describes the format correctly.
>
> Though I'm not sure why the CbCr is defines as an 80bit block
> and Y has a 40bit block. 40bits should be enough for CbCr as well.
>
well, this is taken into account yuv444,  4 y point corresponding with 4 
uv point.

if only describes the layout memory, here can change to 40bit block.

thanks.

>>>> + */
>>>> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
>>>> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
>>>> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
>>>> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
>>>> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
>>>> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
>>>> +
>>>> +/*
>>>>     * 2 plane YCbCr MSB aligned
>>>>     * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>>>     * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
>>>> -- 
>>>> 2.7.4
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> dri-devel mailing list
>>>> dri-devel@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter Oct. 9, 2019, 2:50 p.m. UTC | #6
On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> These new format is supported by some rockchip socs:
> 
> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> 
> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> ---
>  drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>  include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>  2 files changed, 32 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index c630064..ccd78a3 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
>  		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
>  		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
>  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> +		  .hsub = 1, .vsub = 1, .is_yuv = true},
>  		{ .format = DRM_FORMAT_P210,		.depth = 0,
>  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
>  		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,

Yup this is what I had in mind with using the block stuff to describe your
new 10bit yuv formats. Thanks for respining.

Once we've nailed the exact bit description of the format precisely this
can be merged imo.
-Daniel

> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> index 3feeaa3..08e2221 100644
> --- a/include/uapi/drm/drm_fourcc.h
> +++ b/include/uapi/drm/drm_fourcc.h
> @@ -238,6 +238,20 @@ extern "C" {
>  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>  
>  /*
> + * 2 plane YCbCr
> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> + * or
> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> + */
> +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> +
> +/*
>   * 2 plane YCbCr MSB aligned
>   * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>   * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
> -- 
> 2.7.4
> 
> 
>
sandy.huang Oct. 11, 2019, 3:35 a.m. UTC | #7
Hi james.qian.wang,

     Thank for you remind, fou some unknow reason, i miss the the mail 
from you:(, i get this message from 
https://patchwork.kernel.org/patch/11161937/

sorry about that.

     About the format block describe, I also found some unreasonable,  
this format need 2 line aligned, so the block_h need to sed as 2, and 
the char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 
10 for uv plane, so the following describe maybe more correct, thanks.

         { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 2, .vsub = 2, .is_yuv = true},
         { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 2, .vsub = 2, .is_yuv = true},
         { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 2, .vsub = 1, .is_yuv = true},
         { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 2, .vsub = 1, .is_yuv = true},
         { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 1, .vsub = 1, .is_yuv = true},
         { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, 
.block_h = { 2, 2, 0 },
           .hsub = 1, .vsub = 1, .is_yuv = true},


 > >          { .format = DRM_FORMAT_P016,        .depth = 0,  
.num_planes = 2,
 > >            .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, 
.block_h = { 1, 0, 0 },
 > >            .hsub = 2, .vsub = 2, .is_yuv = true},
 > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  
.num_planes = 2,
 > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
.block_h = { 4, 4, 0 },

 > Hi Sandy:
 > Their is a problem here for char_per_block size of plane[0]:
 > Since: 5 * 8 != 4 * 4 * 10;
 > Seems you mis-set the block_w/h, per your block size the block is 
2x2, and it should be:
 >  .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 
2, 2, 0 },

 > Best Regards:
 > James






在 2019/10/8 下午7:49, sandy.huang 写道:
>
> 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
>> On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
>>> Hi ville syrjala,
>>>
>>> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
>>>> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>>>>> These new format is supported by some rockchip socs:
>>>>>
>>>>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>>>>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>>>>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>>>>
>>>>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>>>>> ---
>>>>>    drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>>>>    include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>>>>    2 files changed, 32 insertions(+)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/drm_fourcc.c 
>>>>> b/drivers/gpu/drm/drm_fourcc.c
>>>>> index c630064..ccd78a3 100644
>>>>> --- a/drivers/gpu/drm/drm_fourcc.c
>>>>> +++ b/drivers/gpu/drm/drm_fourcc.c
>>>>> @@ -261,6 +261,24 @@ const struct drm_format_info 
>>>>> *__drm_format_info(u32 format)
>>>>>            { .format = DRM_FORMAT_P016,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>>              .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 
>>>>> }, .block_h = { 1, 0, 0 },
>>>>>              .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV21_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV16_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV61_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV24_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>> +        { .format = DRM_FORMAT_NV42_10,        .depth = 0,  
>>>>> .num_planes = 2,
>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, 
>>>>> .block_h = { 4, 4, 0 },
>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>            { .format = DRM_FORMAT_P210,        .depth = 0,
>>>>>              .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>>>>              .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub 
>>>>> = 2,
>>>>> diff --git a/include/uapi/drm/drm_fourcc.h 
>>>>> b/include/uapi/drm/drm_fourcc.h
>>>>> index 3feeaa3..08e2221 100644
>>>>> --- a/include/uapi/drm/drm_fourcc.h
>>>>> +++ b/include/uapi/drm/drm_fourcc.h
>>>>> @@ -238,6 +238,20 @@ extern "C" {
>>>>>    #define DRM_FORMAT_NV42        fourcc_code('N', 'V', '4', '2') 
>>>>> /* non-subsampled Cb:Cr plane */
>>>>>       /*
>>>>> + * 2 plane YCbCr
>>>>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>>>>> + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 
>>>>> 10:10:10:10:10:10:10:10
>>>>> + * or
>>>>> + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 
>>>>> 10:10:10:10:10:10:10:10
>>>> So now you're defining it as some kind of byte aligned block.
>>>> With that specifying endianness would now make sense since
>>>> otherwise this tells us absolutely nothing about the memory
>>>> layout.
>>>>
>>>> So I'd either do that, or go back to not specifying anything and
>>>> use some weasel words like "mamory layout is implementation defined"
>>>> which of course means no one can use it for anything that involves
>>>> any kind of cross vendor stuff.
>>> /*
>>>    * 2 plane YCbCr
>>>    * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
>>>    * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
>>> 10:10:10:10:10:10:10:10  little endian
>>>    * or
>>>    * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
>>> 10:10:10:10:10:10:10:10  little endian
>>>    */
>>>
>>> Is this description ok?
>> Seems OK to me, if it actually describes the format correctly.
>>
>> Though I'm not sure why the CbCr is defines as an 80bit block
>> and Y has a 40bit block. 40bits should be enough for CbCr as well.
>>
> well, this is taken into account yuv444,  4 y point corresponding with 
> 4 uv point.
>
> if only describes the layout memory, here can change to 40bit block.
>
> thanks.
>
>>>>> + */
>>>>> +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A', '1', '2') /* 
>>>>> 2x2 subsampled Cr:Cb plane */
>>>>> +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A', '2', '1') /* 
>>>>> 2x2 subsampled Cb:Cr plane */
>>>>> +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A', '1', '6') /* 
>>>>> 2x1 subsampled Cr:Cb plane */
>>>>> +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A', '6', '1') /* 
>>>>> 2x1 subsampled Cb:Cr plane */
>>>>> +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A', '2', '4') /* 
>>>>> non-subsampled Cr:Cb plane */
>>>>> +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A', '4', '2') /* 
>>>>> non-subsampled Cb:Cr plane */
>>>>> +
>>>>> +/*
>>>>>     * 2 plane YCbCr MSB aligned
>>>>>     * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>>>>     * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little 
>>>>> endian
>>>>> -- 
>>>>> 2.7.4
>>>>>
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> dri-devel mailing list
>>>>> dri-devel@lists.freedesktop.org
>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
james qian wang (Arm Technology China) Oct. 11, 2019, 6:44 a.m. UTC | #8
On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
> Hi james.qian.wang,
> 
>     Thank for you remind, fou some unknow reason, i miss the the mail from
> you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
> 
> sorry about that.
> 
>     About the format block describe, I also found some unreasonable,  this
> format need 2 line aligned, so the block_h need to sed as 2, and the
> char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
> plane, so the following describe maybe more correct, thanks.
> 
>         { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 2, .vsub = 2, .is_yuv = true},

Hi Sandy:
I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
the block size can be:

the Y plane:  2x2;
The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)

Then:

.char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};

Thanks
James

>           .hsub = 2, .vsub = 2, .is_yuv = true},
>         { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 2, .vsub = 2, .is_yuv = true},
>         { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 2, .vsub = 1, .is_yuv = true},
>         { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 2, .vsub = 1, .is_yuv = true},
>         { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 1, .vsub = 1, .is_yuv = true},
>         { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
>           .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> = { 2, 2, 0 },
>           .hsub = 1, .vsub = 1, .is_yuv = true},
> 
> 
> > >          { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
> 2,
> > >            .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
> .block_h = { 1, 0, 0 },
> > >            .hsub = 2, .vsub = 2, .is_yuv = true},
> > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
> = 2,
> > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
> .block_h = { 4, 4, 0 },
> 
> > Hi Sandy:
> > Their is a problem here for char_per_block size of plane[0]:
> > Since: 5 * 8 != 4 * 4 * 10;
> > Seems you mis-set the block_w/h, per your block size the block is 2x2, and
> it should be:
> >  .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
> 2, 0 },
> 
> > Best Regards:
> > James
> 
> 
> 
> 
> 
> 
> 在 2019/10/8 下午7:49, sandy.huang 写道:
> > 
> > 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> > > On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> > > > Hi ville syrjala,
> > > > 
> > > > 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > > > > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > > > > These new format is supported by some rockchip socs:
> > > > > > 
> > > > > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > > > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > > > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > > > > 
> > > > > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > > > > ---
> > > > > >    drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > > > > >    include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > > > > >    2 files changed, 32 insertions(+)
> > > > > > 
> > > > > > diff --git a/drivers/gpu/drm/drm_fourcc.c
> > > > > > b/drivers/gpu/drm/drm_fourcc.c
> > > > > > index c630064..ccd78a3 100644
> > > > > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > > > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > > > > @@ -261,6 +261,24 @@ const struct drm_format_info
> > > > > > *__drm_format_info(u32 format)
> > > > > >            { .format = DRM_FORMAT_P016,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > >              .char_per_block = { 2, 4, 0 }, .block_w = {
> > > > > > 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV21_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV16_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV61_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV24_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > +        { .format = DRM_FORMAT_NV42_10,        .depth =
> > > > > > 0,  .num_planes = 2,
> > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > >            { .format = DRM_FORMAT_P210,        .depth = 0,
> > > > > >              .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > > > > >              .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
> > > > > > 0 }, .hsub = 2,
> > > > > > diff --git a/include/uapi/drm/drm_fourcc.h
> > > > > > b/include/uapi/drm/drm_fourcc.h
> > > > > > index 3feeaa3..08e2221 100644
> > > > > > --- a/include/uapi/drm/drm_fourcc.h
> > > > > > +++ b/include/uapi/drm/drm_fourcc.h
> > > > > > @@ -238,6 +238,20 @@ extern "C" {
> > > > > >    #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
> > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > >       /*
> > > > > > + * 2 plane YCbCr
> > > > > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > > > > + * index 1 = Cb:Cr plane,
> > > > > > Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > > > > + * or
> > > > > > + * index 1 = Cr:Cb plane,
> > > > > > Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > > > So now you're defining it as some kind of byte aligned block.
> > > > > With that specifying endianness would now make sense since
> > > > > otherwise this tells us absolutely nothing about the memory
> > > > > layout.
> > > > > 
> > > > > So I'd either do that, or go back to not specifying anything and
> > > > > use some weasel words like "mamory layout is implementation defined"
> > > > > which of course means no one can use it for anything that involves
> > > > > any kind of cross vendor stuff.
> > > > /*
> > > >    * 2 plane YCbCr
> > > >    * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
> > > >    * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
> > > > 10:10:10:10:10:10:10:10  little endian
> > > >    * or
> > > >    * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
> > > > 10:10:10:10:10:10:10:10  little endian
> > > >    */
> > > > 
> > > > Is this description ok?
> > > Seems OK to me, if it actually describes the format correctly.
> > > 
> > > Though I'm not sure why the CbCr is defines as an 80bit block
> > > and Y has a 40bit block. 40bits should be enough for CbCr as well.
> > > 
> > well, this is taken into account yuv444,  4 y point corresponding with 4
> > uv point.
> > 
> > if only describes the layout memory, here can change to 40bit block.
> > 
> > thanks.
> > 
> > > > > > + */
> > > > > > +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
> > > > > > '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > > > > +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
> > > > > > '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > > > > +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
> > > > > > '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > > > > +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
> > > > > > '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > > > > +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
> > > > > > '2', '4') /* non-subsampled Cr:Cb plane */
> > > > > > +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
> > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > +
> > > > > > +/*
> > > > > >     * 2 plane YCbCr MSB aligned
> > > > > >     * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > > > > >     * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
> > > > > > [10:6:10:6] little endian
> > > > > > -- 
> > > > > > 2.7.4
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > > _______________________________________________
> > > > > > dri-devel mailing list
> > > > > > dri-devel@lists.freedesktop.org
> > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > 
> > 
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
sandy.huang Oct. 11, 2019, 7:07 a.m. UTC | #9
在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
> On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
>> Hi james.qian.wang,
>>
>>      Thank for you remind, fou some unknow reason, i miss the the mail from
>> you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
>>
>> sorry about that.
>>
>>      About the format block describe, I also found some unreasonable,  this
>> format need 2 line aligned, so the block_h need to sed as 2, and the
>> char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
>> plane, so the following describe maybe more correct, thanks.
>>
>>          { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 2, .vsub = 2, .is_yuv = true},
> Hi Sandy:
> I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
> the block size can be:
>
> the Y plane:  2x2;
> The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
>
> Then:
>
> .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
>
> Thanks
> James

Hi James,

If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,  
although we use block to describe this format, but actually the data is 
still stored one line by one line, still need 4 pixel aligned. so i 
think here need use 4pixel*2line for per block,

Thanks,

sandy.huang.

>
>>            .hsub = 2, .vsub = 2, .is_yuv = true},
>>          { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 2, .vsub = 2, .is_yuv = true},
>>          { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 2, .vsub = 1, .is_yuv = true},
>>          { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 2, .vsub = 1, .is_yuv = true},
>>          { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 1, .vsub = 1, .is_yuv = true},
>>          { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
>>            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>> = { 2, 2, 0 },
>>            .hsub = 1, .vsub = 1, .is_yuv = true},
>>
>>
>>>>            { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
>> 2,
>>>>              .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
>> .block_h = { 1, 0, 0 },
>>>>              .hsub = 2, .vsub = 2, .is_yuv = true},
>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
>> = 2,
>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
>> .block_h = { 4, 4, 0 },
>>
>>> Hi Sandy:
>>> Their is a problem here for char_per_block size of plane[0]:
>>> Since: 5 * 8 != 4 * 4 * 10;
>>> Seems you mis-set the block_w/h, per your block size the block is 2x2, and
>> it should be:
>>>    .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
>> 2, 0 },
>>
>>> Best Regards:
>>> James
>>
>>
>>
>>
>>
>> 在 2019/10/8 下午7:49, sandy.huang 写道:
>>> 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
>>>> On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
>>>>> Hi ville syrjala,
>>>>>
>>>>> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
>>>>>> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>>>>>>> These new format is supported by some rockchip socs:
>>>>>>>
>>>>>>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>>>>>>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>>>>>>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>>>>>>
>>>>>>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>>>>>>> ---
>>>>>>>     drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>>>>>>     include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>>>>>>     2 files changed, 32 insertions(+)
>>>>>>>
>>>>>>> diff --git a/drivers/gpu/drm/drm_fourcc.c
>>>>>>> b/drivers/gpu/drm/drm_fourcc.c
>>>>>>> index c630064..ccd78a3 100644
>>>>>>> --- a/drivers/gpu/drm/drm_fourcc.c
>>>>>>> +++ b/drivers/gpu/drm/drm_fourcc.c
>>>>>>> @@ -261,6 +261,24 @@ const struct drm_format_info
>>>>>>> *__drm_format_info(u32 format)
>>>>>>>             { .format = DRM_FORMAT_P016,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>>               .char_per_block = { 2, 4, 0 }, .block_w = {
>>>>>>> 1, 0, 0 }, .block_h = { 1, 0, 0 },
>>>>>>>               .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV21_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV16_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV61_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV24_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>> +        { .format = DRM_FORMAT_NV42_10,        .depth =
>>>>>>> 0,  .num_planes = 2,
>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>>             { .format = DRM_FORMAT_P210,        .depth = 0,
>>>>>>>               .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>>>>>>               .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
>>>>>>> 0 }, .hsub = 2,
>>>>>>> diff --git a/include/uapi/drm/drm_fourcc.h
>>>>>>> b/include/uapi/drm/drm_fourcc.h
>>>>>>> index 3feeaa3..08e2221 100644
>>>>>>> --- a/include/uapi/drm/drm_fourcc.h
>>>>>>> +++ b/include/uapi/drm/drm_fourcc.h
>>>>>>> @@ -238,6 +238,20 @@ extern "C" {
>>>>>>>     #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>>        /*
>>>>>>> + * 2 plane YCbCr
>>>>>>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>>>>>>> + * index 1 = Cb:Cr plane,
>>>>>>> Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
>>>>>>> + * or
>>>>>>> + * index 1 = Cr:Cb plane,
>>>>>>> Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
>>>>>> So now you're defining it as some kind of byte aligned block.
>>>>>> With that specifying endianness would now make sense since
>>>>>> otherwise this tells us absolutely nothing about the memory
>>>>>> layout.
>>>>>>
>>>>>> So I'd either do that, or go back to not specifying anything and
>>>>>> use some weasel words like "mamory layout is implementation defined"
>>>>>> which of course means no one can use it for anything that involves
>>>>>> any kind of cross vendor stuff.
>>>>> /*
>>>>>     * 2 plane YCbCr
>>>>>     * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
>>>>>     * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>     * or
>>>>>     * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>     */
>>>>>
>>>>> Is this description ok?
>>>> Seems OK to me, if it actually describes the format correctly.
>>>>
>>>> Though I'm not sure why the CbCr is defines as an 80bit block
>>>> and Y has a 40bit block. 40bits should be enough for CbCr as well.
>>>>
>>> well, this is taken into account yuv444,  4 y point corresponding with 4
>>> uv point.
>>>
>>> if only describes the layout memory, here can change to 40bit block.
>>>
>>> thanks.
>>>
>>>>>>> + */
>>>>>>> +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
>>>>>>> '1', '2') /* 2x2 subsampled Cr:Cb plane */
>>>>>>> +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
>>>>>>> '2', '1') /* 2x2 subsampled Cb:Cr plane */
>>>>>>> +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
>>>>>>> '1', '6') /* 2x1 subsampled Cr:Cb plane */
>>>>>>> +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
>>>>>>> '6', '1') /* 2x1 subsampled Cb:Cr plane */
>>>>>>> +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
>>>>>>> '2', '4') /* non-subsampled Cr:Cb plane */
>>>>>>> +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>> +
>>>>>>> +/*
>>>>>>>      * 2 plane YCbCr MSB aligned
>>>>>>>      * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>>>>>>      * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
>>>>>>> [10:6:10:6] little endian
>>>>>>> -- 
>>>>>>> 2.7.4
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> _______________________________________________
>>>>>>> dri-devel mailing list
>>>>>>> dri-devel@lists.freedesktop.org
>>>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
james qian wang (Arm Technology China) Oct. 11, 2019, 7:22 a.m. UTC | #10
On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
> 
> 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
> > On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
> > > Hi james.qian.wang,
> > > 
> > >      Thank for you remind, fou some unknow reason, i miss the the mail from
> > > you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
> > > 
> > > sorry about that.
> > > 
> > >      About the format block describe, I also found some unreasonable,  this
> > > format need 2 line aligned, so the block_h need to sed as 2, and the
> > > char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
> > > plane, so the following describe maybe more correct, thanks.
> > > 
> > >          { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 2, .vsub = 2, .is_yuv = true},
> > Hi Sandy:
> > I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
> > the block size can be:
> > 
> > the Y plane:  2x2;
> > The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
> > 
> > Then:
> > 
> > .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
> > 
> > Thanks
> > James
> 
> Hi James,
> 
> If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0, 

Hi Sandy:
you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.

> although we use block to describe this format, but actually the data is
> still stored one line by one line, still need 4 pixel aligned. so i think
> here need use 4pixel*2line for per block

I think this is your hardware specific requirement.

Thanks
James
> 
> Thanks,
> 
> sandy.huang.
> 
> > 
> > >            .hsub = 2, .vsub = 2, .is_yuv = true},
> > >          { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 2, .vsub = 2, .is_yuv = true},
> > >          { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 2, .vsub = 1, .is_yuv = true},
> > >          { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 2, .vsub = 1, .is_yuv = true},
> > >          { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 1, .vsub = 1, .is_yuv = true},
> > >          { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
> > >            .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > = { 2, 2, 0 },
> > >            .hsub = 1, .vsub = 1, .is_yuv = true},
> > > 
> > > 
> > > > >            { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
> > > 2,
> > > > >              .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
> > > .block_h = { 1, 0, 0 },
> > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
> > > = 2,
> > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
> > > .block_h = { 4, 4, 0 },
> > > 
> > > > Hi Sandy:
> > > > Their is a problem here for char_per_block size of plane[0]:
> > > > Since: 5 * 8 != 4 * 4 * 10;
> > > > Seems you mis-set the block_w/h, per your block size the block is 2x2, and
> > > it should be:
> > > >    .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
> > > 2, 0 },
> > > 
> > > > Best Regards:
> > > > James
> > > 
> > > 
> > > 
> > > 
> > > 
> > > 在 2019/10/8 下午7:49, sandy.huang 写道:
> > > > 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> > > > > On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> > > > > > Hi ville syrjala,
> > > > > > 
> > > > > > 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > > > > > > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > > > > > > These new format is supported by some rockchip socs:
> > > > > > > > 
> > > > > > > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > > > > > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > > > > > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > > > > > > 
> > > > > > > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > > > > > > ---
> > > > > > > >     drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > > > > > > >     include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > > > > > > >     2 files changed, 32 insertions(+)
> > > > > > > > 
> > > > > > > > diff --git a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > index c630064..ccd78a3 100644
> > > > > > > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > @@ -261,6 +261,24 @@ const struct drm_format_info
> > > > > > > > *__drm_format_info(u32 format)
> > > > > > > >             { .format = DRM_FORMAT_P016,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > >               .char_per_block = { 2, 4, 0 }, .block_w = {
> > > > > > > > 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > > > > > > >               .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV21_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV16_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV61_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV24_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > +        { .format = DRM_FORMAT_NV42_10,        .depth =
> > > > > > > > 0,  .num_planes = 2,
> > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > >             { .format = DRM_FORMAT_P210,        .depth = 0,
> > > > > > > >               .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > > > > > > >               .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
> > > > > > > > 0 }, .hsub = 2,
> > > > > > > > diff --git a/include/uapi/drm/drm_fourcc.h
> > > > > > > > b/include/uapi/drm/drm_fourcc.h
> > > > > > > > index 3feeaa3..08e2221 100644
> > > > > > > > --- a/include/uapi/drm/drm_fourcc.h
> > > > > > > > +++ b/include/uapi/drm/drm_fourcc.h
> > > > > > > > @@ -238,6 +238,20 @@ extern "C" {
> > > > > > > >     #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
> > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > >        /*
> > > > > > > > + * 2 plane YCbCr
> > > > > > > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > > > > > > + * index 1 = Cb:Cr plane,
> > > > > > > > Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > > > > > > + * or
> > > > > > > > + * index 1 = Cr:Cb plane,
> > > > > > > > Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > > > > > So now you're defining it as some kind of byte aligned block.
> > > > > > > With that specifying endianness would now make sense since
> > > > > > > otherwise this tells us absolutely nothing about the memory
> > > > > > > layout.
> > > > > > > 
> > > > > > > So I'd either do that, or go back to not specifying anything and
> > > > > > > use some weasel words like "mamory layout is implementation defined"
> > > > > > > which of course means no one can use it for anything that involves
> > > > > > > any kind of cross vendor stuff.
> > > > > > /*
> > > > > >     * 2 plane YCbCr
> > > > > >     * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
> > > > > >     * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
> > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > >     * or
> > > > > >     * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
> > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > >     */
> > > > > > 
> > > > > > Is this description ok?
> > > > > Seems OK to me, if it actually describes the format correctly.
> > > > > 
> > > > > Though I'm not sure why the CbCr is defines as an 80bit block
> > > > > and Y has a 40bit block. 40bits should be enough for CbCr as well.
> > > > > 
> > > > well, this is taken into account yuv444,  4 y point corresponding with 4
> > > > uv point.
> > > > 
> > > > if only describes the layout memory, here can change to 40bit block.
> > > > 
> > > > thanks.
> > > > 
> > > > > > > > + */
> > > > > > > > +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
> > > > > > > > '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > > > > > > +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
> > > > > > > > '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > > > > > > +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
> > > > > > > > '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > > > > > > +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
> > > > > > > > '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > > > > > > +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
> > > > > > > > '2', '4') /* non-subsampled Cr:Cb plane */
> > > > > > > > +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
> > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > +
> > > > > > > > +/*
> > > > > > > >      * 2 plane YCbCr MSB aligned
> > > > > > > >      * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > > > > > > >      * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
> > > > > > > > [10:6:10:6] little endian
> > > > > > > > -- 
> > > > > > > > 2.7.4
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > > > > > _______________________________________________
> > > > > > > > dri-devel mailing list
> > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > > > 
> > > > _______________________________________________
> > > > dri-devel mailing list
> > > > dri-devel@lists.freedesktop.org
> > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
sandy.huang Oct. 11, 2019, 7:32 a.m. UTC | #11
在 2019/10/11 下午3:22, james qian wang (Arm Technology China) 写道:
> On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
>> 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
>>> On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
>>>> Hi james.qian.wang,
>>>>
>>>>       Thank for you remind, fou some unknow reason, i miss the the mail from
>>>> you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
>>>>
>>>> sorry about that.
>>>>
>>>>       About the format block describe, I also found some unreasonable,  this
>>>> format need 2 line aligned, so the block_h need to sed as 2, and the
>>>> char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
>>>> plane, so the following describe maybe more correct, thanks.
>>>>
>>>>           { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 2, .vsub = 2, .is_yuv = true},
>>> Hi Sandy:
>>> I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
>>> the block size can be:
>>>
>>> the Y plane:  2x2;
>>> The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
>>>
>>> Then:
>>>
>>> .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
>>>
>>> Thanks
>>> James
>> Hi James,
>>
>> If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,
> Hi Sandy:
> you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.
here is for y plane.
>> although we use block to describe this format, but actually the data is
>> still stored one line by one line, still need 4 pixel aligned. so i think
>> here need use 4pixel*2line for per block
> I think this is your hardware specific requirement.
>
> Thanks
> James

yes, this is a new format first used at rockchip platform.


Thanks,

sandy.huang

>> Thanks,
>>
>> sandy.huang.
>>
>>>>             .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>           { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>           { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>           { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>           { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>           { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
>>>>             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>> = { 2, 2, 0 },
>>>>             .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>
>>>>
>>>>>>             { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
>>>> 2,
>>>>>>               .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
>>>> .block_h = { 1, 0, 0 },
>>>>>>               .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
>>>> = 2,
>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
>>>> .block_h = { 4, 4, 0 },
>>>>
>>>>> Hi Sandy:
>>>>> Their is a problem here for char_per_block size of plane[0]:
>>>>> Since: 5 * 8 != 4 * 4 * 10;
>>>>> Seems you mis-set the block_w/h, per your block size the block is 2x2, and
>>>> it should be:
>>>>>     .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
>>>> 2, 0 },
>>>>
>>>>> Best Regards:
>>>>> James
>>>>
>>>>
>>>>
>>>>
>>>> 在 2019/10/8 下午7:49, sandy.huang 写道:
>>>>> 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
>>>>>> On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
>>>>>>> Hi ville syrjala,
>>>>>>>
>>>>>>> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
>>>>>>>> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>>>>>>>>> These new format is supported by some rockchip socs:
>>>>>>>>>
>>>>>>>>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>>>>>>>>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>>>>>>>>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>>>>>>>>
>>>>>>>>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>>>>>>>>> ---
>>>>>>>>>      drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>>>>>>>>      include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>>>>>>>>      2 files changed, 32 insertions(+)
>>>>>>>>>
>>>>>>>>> diff --git a/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>> b/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>> index c630064..ccd78a3 100644
>>>>>>>>> --- a/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>> +++ b/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>> @@ -261,6 +261,24 @@ const struct drm_format_info
>>>>>>>>> *__drm_format_info(u32 format)
>>>>>>>>>              { .format = DRM_FORMAT_P016,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>                .char_per_block = { 2, 4, 0 }, .block_w = {
>>>>>>>>> 1, 0, 0 }, .block_h = { 1, 0, 0 },
>>>>>>>>>                .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV21_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV16_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV61_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV24_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>>>> +        { .format = DRM_FORMAT_NV42_10,        .depth =
>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>>>>              { .format = DRM_FORMAT_P210,        .depth = 0,
>>>>>>>>>                .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>>>>>>>>                .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
>>>>>>>>> 0 }, .hsub = 2,
>>>>>>>>> diff --git a/include/uapi/drm/drm_fourcc.h
>>>>>>>>> b/include/uapi/drm/drm_fourcc.h
>>>>>>>>> index 3feeaa3..08e2221 100644
>>>>>>>>> --- a/include/uapi/drm/drm_fourcc.h
>>>>>>>>> +++ b/include/uapi/drm/drm_fourcc.h
>>>>>>>>> @@ -238,6 +238,20 @@ extern "C" {
>>>>>>>>>      #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
>>>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>>>>         /*
>>>>>>>>> + * 2 plane YCbCr
>>>>>>>>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>>>>>>>>> + * index 1 = Cb:Cr plane,
>>>>>>>>> Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
>>>>>>>>> + * or
>>>>>>>>> + * index 1 = Cr:Cb plane,
>>>>>>>>> Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
>>>>>>>> So now you're defining it as some kind of byte aligned block.
>>>>>>>> With that specifying endianness would now make sense since
>>>>>>>> otherwise this tells us absolutely nothing about the memory
>>>>>>>> layout.
>>>>>>>>
>>>>>>>> So I'd either do that, or go back to not specifying anything and
>>>>>>>> use some weasel words like "mamory layout is implementation defined"
>>>>>>>> which of course means no one can use it for anything that involves
>>>>>>>> any kind of cross vendor stuff.
>>>>>>> /*
>>>>>>>      * 2 plane YCbCr
>>>>>>>      * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
>>>>>>>      * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
>>>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>>>      * or
>>>>>>>      * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
>>>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>>>      */
>>>>>>>
>>>>>>> Is this description ok?
>>>>>> Seems OK to me, if it actually describes the format correctly.
>>>>>>
>>>>>> Though I'm not sure why the CbCr is defines as an 80bit block
>>>>>> and Y has a 40bit block. 40bits should be enough for CbCr as well.
>>>>>>
>>>>> well, this is taken into account yuv444,  4 y point corresponding with 4
>>>>> uv point.
>>>>>
>>>>> if only describes the layout memory, here can change to 40bit block.
>>>>>
>>>>> thanks.
>>>>>
>>>>>>>>> + */
>>>>>>>>> +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
>>>>>>>>> '1', '2') /* 2x2 subsampled Cr:Cb plane */
>>>>>>>>> +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
>>>>>>>>> '2', '1') /* 2x2 subsampled Cb:Cr plane */
>>>>>>>>> +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
>>>>>>>>> '1', '6') /* 2x1 subsampled Cr:Cb plane */
>>>>>>>>> +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
>>>>>>>>> '6', '1') /* 2x1 subsampled Cb:Cr plane */
>>>>>>>>> +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
>>>>>>>>> '2', '4') /* non-subsampled Cr:Cb plane */
>>>>>>>>> +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
>>>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>>>> +
>>>>>>>>> +/*
>>>>>>>>>       * 2 plane YCbCr MSB aligned
>>>>>>>>>       * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>>>>>>>>       * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
>>>>>>>>> [10:6:10:6] little endian
>>>>>>>>> -- 
>>>>>>>>> 2.7.4
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> _______________________________________________
>>>>>>>>> dri-devel mailing list
>>>>>>>>> dri-devel@lists.freedesktop.org
>>>>>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>>> _______________________________________________
>>>>> dri-devel mailing list
>>>>> dri-devel@lists.freedesktop.org
>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
james qian wang (Arm Technology China) Oct. 11, 2019, 8:32 a.m. UTC | #12
On Fri, Oct 11, 2019 at 03:32:17PM +0800, sandy.huang wrote:
> 
> 在 2019/10/11 下午3:22, james qian wang (Arm Technology China) 写道:
> > On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
> > > 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
> > > > On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
> > > > > Hi james.qian.wang,
> > > > > 
> > > > >       Thank for you remind, fou some unknow reason, i miss the the mail from
> > > > > you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
> > > > > 
> > > > > sorry about that.
> > > > > 
> > > > >       About the format block describe, I also found some unreasonable,  this
> > > > > format need 2 line aligned, so the block_h need to sed as 2, and the
> > > > > char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
> > > > > plane, so the following describe maybe more correct, thanks.
> > > > > 
> > > > >           { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > Hi Sandy:
> > > > I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
> > > > the block size can be:
> > > > 
> > > > the Y plane:  2x2;
> > > > The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
> > > > 
> > > > Then:
> > > > 
> > > > .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
> > > > 
> > > > Thanks
> > > > James
> > > Hi James,
> > > 
> > > If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,
> > Hi Sandy:
> > you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.
> here is for y plane.

Sorry, Are we talking about the block size calcaltion here ?

block_size = block_w * block_h * plane_bpp

for you Y plane a 2x2 block is: 2 x 2 * 10 bpp = 40bits

And the block info is for computing the minimum pitch, and don't
consider the specific hardware alignment here.

see: drm_format_info_min_pitch()

If you hardware need alignment, you need to put that consideration into your
specific driver.

James.

> > > although we use block to describe this format, but actually the data is
> > > still stored one line by one line, still need 4 pixel aligned. so i think
> > > here need use 4pixel*2line for per block
> > I think this is your hardware specific requirement.
> > 
> > Thanks
> > James
> 
> yes, this is a new format first used at rockchip platform.
> 
> 
> Thanks,
> 
> sandy.huang
> 
> > > Thanks,
> > > 
> > > sandy.huang.
> > > 
> > > > >             .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > >           { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > >           { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > >           { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > >           { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > >           { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
> > > > >             .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > = { 2, 2, 0 },
> > > > >             .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > 
> > > > > 
> > > > > > >             { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
> > > > > 2,
> > > > > > >               .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
> > > > > .block_h = { 1, 0, 0 },
> > > > > > >               .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
> > > > > = 2,
> > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
> > > > > .block_h = { 4, 4, 0 },
> > > > > 
> > > > > > Hi Sandy:
> > > > > > Their is a problem here for char_per_block size of plane[0]:
> > > > > > Since: 5 * 8 != 4 * 4 * 10;
> > > > > > Seems you mis-set the block_w/h, per your block size the block is 2x2, and
> > > > > it should be:
> > > > > >     .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
> > > > > 2, 0 },
> > > > > 
> > > > > > Best Regards:
> > > > > > James
> > > > > 
> > > > > 
> > > > > 
> > > > > 
> > > > > 在 2019/10/8 下午7:49, sandy.huang 写道:
> > > > > > 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> > > > > > > On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> > > > > > > > Hi ville syrjala,
> > > > > > > > 
> > > > > > > > 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > > > > > > > > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > > > > > > > > These new format is supported by some rockchip socs:
> > > > > > > > > > 
> > > > > > > > > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > > > > > > > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > > > > > > > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > > > > > > > > 
> > > > > > > > > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > > > > > > > > ---
> > > > > > > > > >      drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > > > > > > > > >      include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > > > > > > > > >      2 files changed, 32 insertions(+)
> > > > > > > > > > 
> > > > > > > > > > diff --git a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > index c630064..ccd78a3 100644
> > > > > > > > > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > @@ -261,6 +261,24 @@ const struct drm_format_info
> > > > > > > > > > *__drm_format_info(u32 format)
> > > > > > > > > >              { .format = DRM_FORMAT_P016,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > >                .char_per_block = { 2, 4, 0 }, .block_w = {
> > > > > > > > > > 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > > > > > > > > >                .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV21_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV16_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV61_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV24_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > > +        { .format = DRM_FORMAT_NV42_10,        .depth =
> > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > >              { .format = DRM_FORMAT_P210,        .depth = 0,
> > > > > > > > > >                .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > > > > > > > > >                .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
> > > > > > > > > > 0 }, .hsub = 2,
> > > > > > > > > > diff --git a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > index 3feeaa3..08e2221 100644
> > > > > > > > > > --- a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > +++ b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > @@ -238,6 +238,20 @@ extern "C" {
> > > > > > > > > >      #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
> > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > >         /*
> > > > > > > > > > + * 2 plane YCbCr
> > > > > > > > > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > > > > > > > > + * index 1 = Cb:Cr plane,
> > > > > > > > > > Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > > > > > > > > + * or
> > > > > > > > > > + * index 1 = Cr:Cb plane,
> > > > > > > > > > Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > > > > > > > So now you're defining it as some kind of byte aligned block.
> > > > > > > > > With that specifying endianness would now make sense since
> > > > > > > > > otherwise this tells us absolutely nothing about the memory
> > > > > > > > > layout.
> > > > > > > > > 
> > > > > > > > > So I'd either do that, or go back to not specifying anything and
> > > > > > > > > use some weasel words like "mamory layout is implementation defined"
> > > > > > > > > which of course means no one can use it for anything that involves
> > > > > > > > > any kind of cross vendor stuff.
> > > > > > > > /*
> > > > > > > >      * 2 plane YCbCr
> > > > > > > >      * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
> > > > > > > >      * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
> > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > >      * or
> > > > > > > >      * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
> > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > >      */
> > > > > > > > 
> > > > > > > > Is this description ok?
> > > > > > > Seems OK to me, if it actually describes the format correctly.
> > > > > > > 
> > > > > > > Though I'm not sure why the CbCr is defines as an 80bit block
> > > > > > > and Y has a 40bit block. 40bits should be enough for CbCr as well.
> > > > > > > 
> > > > > > well, this is taken into account yuv444,  4 y point corresponding with 4
> > > > > > uv point.
> > > > > > 
> > > > > > if only describes the layout memory, here can change to 40bit block.
> > > > > > 
> > > > > > thanks.
> > > > > > 
> > > > > > > > > > + */
> > > > > > > > > > +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
> > > > > > > > > > '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > > > > > > > > +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
> > > > > > > > > > '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > > > > > > > > +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
> > > > > > > > > > '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > > > > > > > > +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
> > > > > > > > > > '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > > > > > > > > +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
> > > > > > > > > > '2', '4') /* non-subsampled Cr:Cb plane */
> > > > > > > > > > +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
> > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > > +
> > > > > > > > > > +/*
> > > > > > > > > >       * 2 plane YCbCr MSB aligned
> > > > > > > > > >       * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > > > > > > > > >       * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
> > > > > > > > > > [10:6:10:6] little endian
> > > > > > > > > > -- 
> > > > > > > > > > 2.7.4
> > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > _______________________________________________
> > > > > > > > > > dri-devel mailing list
> > > > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > > > > > _______________________________________________
> > > > > > dri-devel mailing list
> > > > > > dri-devel@lists.freedesktop.org
> > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
sandy.huang Oct. 11, 2019, 9:45 a.m. UTC | #13
Hi, james, ville syrjala, david,

在 2019/10/11 下午4:32, james qian wang (Arm Technology China) 写道:
> On Fri, Oct 11, 2019 at 03:32:17PM +0800, sandy.huang wrote:
>> 在 2019/10/11 下午3:22, james qian wang (Arm Technology China) 写道:
>>> On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
>>>> 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
>>>>> On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
>>>>>> Hi james.qian.wang,
>>>>>>
>>>>>>        Thank for you remind, fou some unknow reason, i miss the the mail from
>>>>>> you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
>>>>>>
>>>>>> sorry about that.
>>>>>>
>>>>>>        About the format block describe, I also found some unreasonable,  this
>>>>>> format need 2 line aligned, so the block_h need to sed as 2, and the
>>>>>> char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
>>>>>> plane, so the following describe maybe more correct, thanks.
>>>>>>
>>>>>>            { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>> Hi Sandy:
>>>>> I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
>>>>> the block size can be:
>>>>>
>>>>> the Y plane:  2x2;
>>>>> The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
>>>>>
>>>>> Then:
>>>>>
>>>>> .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
>>>>>
>>>>> Thanks
>>>>> James
>>>> Hi James,
>>>>
>>>> If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,
>>> Hi Sandy:
>>> you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.
>> here is for y plane.
> Sorry, Are we talking about the block size calcaltion here ?
>
> block_size = block_w * block_h * plane_bpp
>
> for you Y plane a 2x2 block is: 2 x 2 * 10 bpp = 40bits
>
> And the block info is for computing the minimum pitch, and don't
> consider the specific hardware alignment here.
>
> see: drm_format_info_min_pitch()
>
> If you hardware need alignment, you need to put that consideration into your
> specific driver.
>
> James.

Hi david and ville syrjala,

     Do you have any Suggestions?

     James think Y plane 2x2 block size is enough to describe this 
format, but i prefer to use 4x2 block size, this can include the 
alignment message.

just like the malidp_de_plane_check()@malidp_plane.c have the following  
code, here use the block size to check alignment.

     block_w = drm_format_info_block_width(fb->format, 0);
     block_h = drm_format_info_block_height(fb->format, 0);
     if (fb->width % block_w || fb->height % block_h) {
         DRM_DEBUG_KMS("Buffer width/height needs to be a multiple of 
tile sizes");
         return -EINVAL;
     }
     if ((state->src_x >> 16) % block_w || (state->src_y >> 16) % block_h) {
         DRM_DEBUG_KMS("Plane src_x/src_y needs to be a multiple of tile 
sizes");
         return -EINVAL;
     }

can you give me some suggestions?

thanks,

sandy.huang

>
>>>> although we use block to describe this format, but actually the data is
>>>> still stored one line by one line, still need 4 pixel aligned. so i think
>>>> here need use 4pixel*2line for per block
>>> I think this is your hardware specific requirement.
>>>
>>> Thanks
>>> James
>> yes, this is a new format first used at rockchip platform.
>>
>>
>> Thanks,
>>
>> sandy.huang
>>
>>>> Thanks,
>>>>
>>>> sandy.huang.
>>>>
>>>>>>              .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>            { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>            { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>            { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>            { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>            { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
>>>>>>              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
>>>>>> = { 2, 2, 0 },
>>>>>>              .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>
>>>>>>
>>>>>>>>              { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
>>>>>> 2,
>>>>>>>>                .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
>>>>>> .block_h = { 1, 0, 0 },
>>>>>>>>                .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
>>>>>> = 2,
>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
>>>>>> .block_h = { 4, 4, 0 },
>>>>>>
>>>>>>> Hi Sandy:
>>>>>>> Their is a problem here for char_per_block size of plane[0]:
>>>>>>> Since: 5 * 8 != 4 * 4 * 10;
>>>>>>> Seems you mis-set the block_w/h, per your block size the block is 2x2, and
>>>>>> it should be:
>>>>>>>      .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
>>>>>> 2, 0 },
>>>>>>
>>>>>>> Best Regards:
>>>>>>> James
>>>>>>
>>>>>>
>>>>>>
>>>>>> 在 2019/10/8 下午7:49, sandy.huang 写道:
>>>>>>> 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
>>>>>>>> On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
>>>>>>>>> Hi ville syrjala,
>>>>>>>>>
>>>>>>>>> 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
>>>>>>>>>> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
>>>>>>>>>>> These new format is supported by some rockchip socs:
>>>>>>>>>>>
>>>>>>>>>>> DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
>>>>>>>>>>> DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
>>>>>>>>>>> DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
>>>>>>>>>>>
>>>>>>>>>>> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
>>>>>>>>>>> ---
>>>>>>>>>>>       drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
>>>>>>>>>>>       include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
>>>>>>>>>>>       2 files changed, 32 insertions(+)
>>>>>>>>>>>
>>>>>>>>>>> diff --git a/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>>>> b/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>>>> index c630064..ccd78a3 100644
>>>>>>>>>>> --- a/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>>>> +++ b/drivers/gpu/drm/drm_fourcc.c
>>>>>>>>>>> @@ -261,6 +261,24 @@ const struct drm_format_info
>>>>>>>>>>> *__drm_format_info(u32 format)
>>>>>>>>>>>               { .format = DRM_FORMAT_P016,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>>                 .char_per_block = { 2, 4, 0 }, .block_w = {
>>>>>>>>>>> 1, 0, 0 }, .block_h = { 1, 0, 0 },
>>>>>>>>>>>                 .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV12_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV21_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 2, .vsub = 2, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV16_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV61_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 2, .vsub = 1, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV24_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>>>>>> +        { .format = DRM_FORMAT_NV42_10,        .depth =
>>>>>>>>>>> 0,  .num_planes = 2,
>>>>>>>>>>> +          .char_per_block = { 5, 10, 0 }, .block_w = {
>>>>>>>>>>> 4, 4, 0 }, .block_h = { 4, 4, 0 },
>>>>>>>>>>> +          .hsub = 1, .vsub = 1, .is_yuv = true},
>>>>>>>>>>>               { .format = DRM_FORMAT_P210,        .depth = 0,
>>>>>>>>>>>                 .num_planes = 2, .char_per_block = { 2, 4, 0 },
>>>>>>>>>>>                 .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
>>>>>>>>>>> 0 }, .hsub = 2,
>>>>>>>>>>> diff --git a/include/uapi/drm/drm_fourcc.h
>>>>>>>>>>> b/include/uapi/drm/drm_fourcc.h
>>>>>>>>>>> index 3feeaa3..08e2221 100644
>>>>>>>>>>> --- a/include/uapi/drm/drm_fourcc.h
>>>>>>>>>>> +++ b/include/uapi/drm/drm_fourcc.h
>>>>>>>>>>> @@ -238,6 +238,20 @@ extern "C" {
>>>>>>>>>>>       #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
>>>>>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>>>>>>          /*
>>>>>>>>>>> + * 2 plane YCbCr
>>>>>>>>>>> + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
>>>>>>>>>>> + * index 1 = Cb:Cr plane,
>>>>>>>>>>> Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
>>>>>>>>>>> + * or
>>>>>>>>>>> + * index 1 = Cr:Cb plane,
>>>>>>>>>>> Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
>>>>>>>>>> So now you're defining it as some kind of byte aligned block.
>>>>>>>>>> With that specifying endianness would now make sense since
>>>>>>>>>> otherwise this tells us absolutely nothing about the memory
>>>>>>>>>> layout.
>>>>>>>>>>
>>>>>>>>>> So I'd either do that, or go back to not specifying anything and
>>>>>>>>>> use some weasel words like "mamory layout is implementation defined"
>>>>>>>>>> which of course means no one can use it for anything that involves
>>>>>>>>>> any kind of cross vendor stuff.
>>>>>>>>> /*
>>>>>>>>>       * 2 plane YCbCr
>>>>>>>>>       * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
>>>>>>>>>       * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
>>>>>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>>>>>       * or
>>>>>>>>>       * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
>>>>>>>>> 10:10:10:10:10:10:10:10  little endian
>>>>>>>>>       */
>>>>>>>>>
>>>>>>>>> Is this description ok?
>>>>>>>> Seems OK to me, if it actually describes the format correctly.
>>>>>>>>
>>>>>>>> Though I'm not sure why the CbCr is defines as an 80bit block
>>>>>>>> and Y has a 40bit block. 40bits should be enough for CbCr as well.
>>>>>>>>
>>>>>>> well, this is taken into account yuv444,  4 y point corresponding with 4
>>>>>>> uv point.
>>>>>>>
>>>>>>> if only describes the layout memory, here can change to 40bit block.
>>>>>>>
>>>>>>> thanks.
>>>>>>>
>>>>>>>>>>> + */
>>>>>>>>>>> +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
>>>>>>>>>>> '1', '2') /* 2x2 subsampled Cr:Cb plane */
>>>>>>>>>>> +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
>>>>>>>>>>> '2', '1') /* 2x2 subsampled Cb:Cr plane */
>>>>>>>>>>> +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
>>>>>>>>>>> '1', '6') /* 2x1 subsampled Cr:Cb plane */
>>>>>>>>>>> +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
>>>>>>>>>>> '6', '1') /* 2x1 subsampled Cb:Cr plane */
>>>>>>>>>>> +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
>>>>>>>>>>> '2', '4') /* non-subsampled Cr:Cb plane */
>>>>>>>>>>> +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
>>>>>>>>>>> '4', '2') /* non-subsampled Cb:Cr plane */
>>>>>>>>>>> +
>>>>>>>>>>> +/*
>>>>>>>>>>>        * 2 plane YCbCr MSB aligned
>>>>>>>>>>>        * index 0 = Y plane, [15:0] Y:x [10:6] little endian
>>>>>>>>>>>        * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
>>>>>>>>>>> [10:6:10:6] little endian
>>>>>>>>>>> -- 
>>>>>>>>>>> 2.7.4
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> _______________________________________________
>>>>>>>>>>> dri-devel mailing list
>>>>>>>>>>> dri-devel@lists.freedesktop.org
>>>>>>>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>>>>> _______________________________________________
>>>>>>> dri-devel mailing list
>>>>>>> dri-devel@lists.freedesktop.org
>>>>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
james qian wang (Arm Technology China) Oct. 14, 2019, 3:02 a.m. UTC | #14
On Fri, Oct 11, 2019 at 05:45:45PM +0800, sandy.huang wrote:
> Hi, james, ville syrjala, david,
> 
> 在 2019/10/11 下午4:32, james qian wang (Arm Technology China) 写道:
> > On Fri, Oct 11, 2019 at 03:32:17PM +0800, sandy.huang wrote:
> > > 在 2019/10/11 下午3:22, james qian wang (Arm Technology China) 写道:
> > > > On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
> > > > > 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
> > > > > > On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
> > > > > > > Hi james.qian.wang,
> > > > > > > 
> > > > > > >        Thank for you remind, fou some unknow reason, i miss the the mail from
> > > > > > > you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
> > > > > > > 
> > > > > > > sorry about that.
> > > > > > > 
> > > > > > >        About the format block describe, I also found some unreasonable,  this
> > > > > > > format need 2 line aligned, so the block_h need to sed as 2, and the
> > > > > > > char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
> > > > > > > plane, so the following describe maybe more correct, thanks.
> > > > > > > 
> > > > > > >            { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > Hi Sandy:
> > > > > > I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
> > > > > > the block size can be:
> > > > > > 
> > > > > > the Y plane:  2x2;
> > > > > > The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
> > > > > > 
> > > > > > Then:
> > > > > > 
> > > > > > .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
> > > > > > 
> > > > > > Thanks
> > > > > > James
> > > > > Hi James,
> > > > > 
> > > > > If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,
> > > > Hi Sandy:
> > > > you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.
> > > here is for y plane.
> > Sorry, Are we talking about the block size calcaltion here ?
> > 
> > block_size = block_w * block_h * plane_bpp
> > 
> > for you Y plane a 2x2 block is: 2 x 2 * 10 bpp = 40bits
> > 
> > And the block info is for computing the minimum pitch, and don't
> > consider the specific hardware alignment here.
> > 
> > see: drm_format_info_min_pitch()
> > 
> > If you hardware need alignment, you need to put that consideration into your
> > specific driver.
> > 
> > James.
> 
> Hi david and ville syrjala,
> 
>     Do you have any Suggestions?
> 
>     James think Y plane 2x2 block size is enough to describe this format,
> but i prefer to use 4x2 block size, this can include the alignment message.
> 
> just like the malidp_de_plane_check()@malidp_plane.c have the following 
> code, here use the block size to check alignment.
> 
>     block_w = drm_format_info_block_width(fb->format, 0);
>     block_h = drm_format_info_block_height(fb->format, 0);
>     if (fb->width % block_w || fb->height % block_h) {
>         DRM_DEBUG_KMS("Buffer width/height needs to be a multiple of tile
> sizes");
>         return -EINVAL;
>     }
>     if ((state->src_x >> 16) % block_w || (state->src_y >> 16) % block_h) {
>         DRM_DEBUG_KMS("Plane src_x/src_y needs to be a multiple of tile
> sizes");
>         return -EINVAL;
>     }
> 
> can you give me some suggestions?
> 
> thanks,
> 
> sandy.huang


Well, you think I'm trying to spite you.

but the alignment 4 for NV12-10bpp do have risk, please consider the existing
code:

framebuffer_check()
{
        ...
	for (i = 0; i < info->num_planes; i++) {
		unsigned int width = fb_plane_width(r->width, info, i);
		unsigned int height = fb_plane_height(r->height, info, i);
		unsigned int block_size = info->char_per_block[i];
		u64 min_pitch = drm_format_info_min_pitch(info, i, width);

                ...

                /* NOTE NOTE:
                 * this check may failed for NV12-10 if someone's alignment lower
                 * that 4 */

		if (block_size && r->pitches[i] < min_pitch) {
			DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
			return -EINVAL;
		}

}

james

> > 
> > > > > although we use block to describe this format, but actually the data is
> > > > > still stored one line by one line, still need 4 pixel aligned. so i think
> > > > > here need use 4pixel*2line for per block
> > > > I think this is your hardware specific requirement.
> > > > 
> > > > Thanks
> > > > James
> > > yes, this is a new format first used at rockchip platform.
> > > 
> > > 
> > > Thanks,
> > > 
> > > sandy.huang
> > > 
> > > > > Thanks,
> > > > > 
> > > > > sandy.huang.
> > > > > 
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > 
> > > > > > > 
> > > > > > > > >              { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
> > > > > > > 2,
> > > > > > > > >                .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
> > > > > > > .block_h = { 1, 0, 0 },
> > > > > > > > >                .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
> > > > > > > = 2,
> > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
> > > > > > > .block_h = { 4, 4, 0 },
> > > > > > > 
> > > > > > > > Hi Sandy:
> > > > > > > > Their is a problem here for char_per_block size of plane[0]:
> > > > > > > > Since: 5 * 8 != 4 * 4 * 10;
> > > > > > > > Seems you mis-set the block_w/h, per your block size the block is 2x2, and
> > > > > > > it should be:
> > > > > > > >      .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
> > > > > > > 2, 0 },
> > > > > > > 
> > > > > > > > Best Regards:
> > > > > > > > James
> > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > > 在 2019/10/8 下午7:49, sandy.huang 写道:
> > > > > > > > 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> > > > > > > > > On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> > > > > > > > > > Hi ville syrjala,
> > > > > > > > > > 
> > > > > > > > > > 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > > > > > > > > > > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > > > > > > > > > > These new format is supported by some rockchip socs:
> > > > > > > > > > > > 
> > > > > > > > > > > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > > > > > > > > > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > > > > > > > > > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > > > > > > > > > > 
> > > > > > > > > > > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > > > > > > > > > > ---
> > > > > > > > > > > >       drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > > > > > > > > > > >       include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > > > > > > > > > > >       2 files changed, 32 insertions(+)
> > > > > > > > > > > > 
> > > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > index c630064..ccd78a3 100644
> > > > > > > > > > > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > @@ -261,6 +261,24 @@ const struct drm_format_info
> > > > > > > > > > > > *__drm_format_info(u32 format)
> > > > > > > > > > > >               { .format = DRM_FORMAT_P016,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > >                 .char_per_block = { 2, 4, 0 }, .block_w = {
> > > > > > > > > > > > 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > > > > > > > > > > >                 .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV21_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV16_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV61_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV24_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV42_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > >               { .format = DRM_FORMAT_P210,        .depth = 0,
> > > > > > > > > > > >                 .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > > > > > > > > > > >                 .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
> > > > > > > > > > > > 0 }, .hsub = 2,
> > > > > > > > > > > > diff --git a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > index 3feeaa3..08e2221 100644
> > > > > > > > > > > > --- a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > +++ b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > @@ -238,6 +238,20 @@ extern "C" {
> > > > > > > > > > > >       #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
> > > > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > > > >          /*
> > > > > > > > > > > > + * 2 plane YCbCr
> > > > > > > > > > > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > > > > > > > > > > + * index 1 = Cb:Cr plane,
> > > > > > > > > > > > Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > > > > > > > > > > + * or
> > > > > > > > > > > > + * index 1 = Cr:Cb plane,
> > > > > > > > > > > > Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > > > > > > > > > So now you're defining it as some kind of byte aligned block.
> > > > > > > > > > > With that specifying endianness would now make sense since
> > > > > > > > > > > otherwise this tells us absolutely nothing about the memory
> > > > > > > > > > > layout.
> > > > > > > > > > > 
> > > > > > > > > > > So I'd either do that, or go back to not specifying anything and
> > > > > > > > > > > use some weasel words like "mamory layout is implementation defined"
> > > > > > > > > > > which of course means no one can use it for anything that involves
> > > > > > > > > > > any kind of cross vendor stuff.
> > > > > > > > > > /*
> > > > > > > > > >       * 2 plane YCbCr
> > > > > > > > > >       * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
> > > > > > > > > >       * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
> > > > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > > > >       * or
> > > > > > > > > >       * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
> > > > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > > > >       */
> > > > > > > > > > 
> > > > > > > > > > Is this description ok?
> > > > > > > > > Seems OK to me, if it actually describes the format correctly.
> > > > > > > > > 
> > > > > > > > > Though I'm not sure why the CbCr is defines as an 80bit block
> > > > > > > > > and Y has a 40bit block. 40bits should be enough for CbCr as well.
> > > > > > > > > 
> > > > > > > > well, this is taken into account yuv444,  4 y point corresponding with 4
> > > > > > > > uv point.
> > > > > > > > 
> > > > > > > > if only describes the layout memory, here can change to 40bit block.
> > > > > > > > 
> > > > > > > > thanks.
> > > > > > > > 
> > > > > > > > > > > > + */
> > > > > > > > > > > > +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '2', '4') /* non-subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > > > > +
> > > > > > > > > > > > +/*
> > > > > > > > > > > >        * 2 plane YCbCr MSB aligned
> > > > > > > > > > > >        * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > > > > > > > > > > >        * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
> > > > > > > > > > > > [10:6:10:6] little endian
> > > > > > > > > > > > -- 
> > > > > > > > > > > > 2.7.4
> > > > > > > > > > > > 
> > > > > > > > > > > > 
> > > > > > > > > > > > 
> > > > > > > > > > > > _______________________________________________
> > > > > > > > > > > > dri-devel mailing list
> > > > > > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > > > > > > > _______________________________________________
> > > > > > > > dri-devel mailing list
> > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Daniel Vetter Oct. 14, 2019, 8:34 a.m. UTC | #15
On Fri, Oct 11, 2019 at 05:45:45PM +0800, sandy.huang wrote:
> Hi, james, ville syrjala, david,
> 
> 在 2019/10/11 下午4:32, james qian wang (Arm Technology China) 写道:
> > On Fri, Oct 11, 2019 at 03:32:17PM +0800, sandy.huang wrote:
> > > 在 2019/10/11 下午3:22, james qian wang (Arm Technology China) 写道:
> > > > On Fri, Oct 11, 2019 at 03:07:22PM +0800, sandy.huang wrote:
> > > > > 在 2019/10/11 下午2:44, james qian wang (Arm Technology China) 写道:
> > > > > > On Fri, Oct 11, 2019 at 11:35:53AM +0800, sandy.huang wrote:
> > > > > > > Hi james.qian.wang,
> > > > > > > 
> > > > > > >        Thank for you remind, fou some unknow reason, i miss the the mail from
> > > > > > > you:(, i get this message from https://patchwork.kernel.org/patch/11161937/
> > > > > > > 
> > > > > > > sorry about that.
> > > > > > > 
> > > > > > >        About the format block describe, I also found some unreasonable,  this
> > > > > > > format need 2 line aligned, so the block_h need to sed as 2, and the
> > > > > > > char_per_block need set as w * h * 10 for y plane, and w * h * 2 * 10 for uv
> > > > > > > plane, so the following describe maybe more correct, thanks.
> > > > > > > 
> > > > > > >            { .format = DRM_FORMAT_NV12_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > Hi Sandy:
> > > > > > I think for such NV12 YUV-422 (hsub = 2, vsub = 2) 2x2 subsampled format
> > > > > > the block size can be:
> > > > > > 
> > > > > > the Y plane:  2x2;
> > > > > > The UV plane: 1x2; (H direction sample 1 Cb and 1Cr, V direction 2 lines got 2)
> > > > > > 
> > > > > > Then:
> > > > > > 
> > > > > > .char_per_block = {5, 5, 0} block_w = {2, 1, 0}. block_h = {2, 2, 0};
> > > > > > 
> > > > > > Thanks
> > > > > > James
> > > > > Hi James,
> > > > > 
> > > > > If the block_w is 2 pixel, one line size at block is 2*10 bit %8 != 0,
> > > > Hi Sandy:
> > > > you got a mistake here, the bpp of UV plane is 20, 10bit Cb + 10 bit Cr.
> > > here is for y plane.
> > Sorry, Are we talking about the block size calcaltion here ?
> > 
> > block_size = block_w * block_h * plane_bpp
> > 
> > for you Y plane a 2x2 block is: 2 x 2 * 10 bpp = 40bits
> > 
> > And the block info is for computing the minimum pitch, and don't
> > consider the specific hardware alignment here.
> > 
> > see: drm_format_info_min_pitch()
> > 
> > If you hardware need alignment, you need to put that consideration into your
> > specific driver.
> > 
> > James.
> 
> Hi david and ville syrjala,
> 
>     Do you have any Suggestions?
> 
>     James think Y plane 2x2 block size is enough to describe this format,
> but i prefer to use 4x2 block size, this can include the alignment message.
> 
> just like the malidp_de_plane_check()@malidp_plane.c have the following 
> code, here use the block size to check alignment.
> 
>     block_w = drm_format_info_block_width(fb->format, 0);
>     block_h = drm_format_info_block_height(fb->format, 0);
>     if (fb->width % block_w || fb->height % block_h) {
>         DRM_DEBUG_KMS("Buffer width/height needs to be a multiple of tile
> sizes");
>         return -EINVAL;
>     }
>     if ((state->src_x >> 16) % block_w || (state->src_y >> 16) % block_h) {
>         DRM_DEBUG_KMS("Plane src_x/src_y needs to be a multiple of tile
> sizes");
>         return -EINVAL;
>     }
> 
> can you give me some suggestions?

For the linear layout (i.e. modifier == 0) the blocks are meant to be laid
out one after the other, linearly, in memory. If you have some additional
hw alignment constraint then that should be checked in the driver.

If you have some tiling on top, then that should be encoded in a different
modifier (which can then set its own block sizes, and have its own rules
for how they're laid out in memory).

Taking this all together I think what we want here is a 1x4 Y block and a
1x2 UV block size in pixels. The sub-sampling is expressed in hsub/vsub
for the UV plane, we don't align the block-sizes two 2 rows to encode that
(see all the other yuv planar formats for examples).
-Daniel

> 
> thanks,
> 
> sandy.huang
> 
> > 
> > > > > although we use block to describe this format, but actually the data is
> > > > > still stored one line by one line, still need 4 pixel aligned. so i think
> > > > > here need use 4pixel*2line for per block
> > > > I think this is your hardware specific requirement.
> > > > 
> > > > Thanks
> > > > James
> > > yes, this is a new format first used at rockchip platform.
> > > 
> > > 
> > > Thanks,
> > > 
> > > sandy.huang
> > > 
> > > > > Thanks,
> > > > > 
> > > > > sandy.huang.
> > > > > 
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV21_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV16_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV61_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV24_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > >            { .format = DRM_FORMAT_NV42_10,        .depth = 0, .num_planes = 2,
> > > > > > >              .char_per_block = { 10, 10, 0 }, .block_w = { 4, 2, 0 }, .block_h
> > > > > > > = { 2, 2, 0 },
> > > > > > >              .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > 
> > > > > > > 
> > > > > > > > >              { .format = DRM_FORMAT_P016,        .depth = 0,  .num_planes =
> > > > > > > 2,
> > > > > > > > >                .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 },
> > > > > > > .block_h = { 1, 0, 0 },
> > > > > > > > >                .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth = 0,  .num_planes
> > > > > > > = 2,
> > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 },
> > > > > > > .block_h = { 4, 4, 0 },
> > > > > > > 
> > > > > > > > Hi Sandy:
> > > > > > > > Their is a problem here for char_per_block size of plane[0]:
> > > > > > > > Since: 5 * 8 != 4 * 4 * 10;
> > > > > > > > Seems you mis-set the block_w/h, per your block size the block is 2x2, and
> > > > > > > it should be:
> > > > > > > >      .char_per_block = { 5, 10, 0 }, .block_w = { 2, 2, 0 }, .block_h = { 2,
> > > > > > > 2, 0 },
> > > > > > > 
> > > > > > > > Best Regards:
> > > > > > > > James
> > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > > 在 2019/10/8 下午7:49, sandy.huang 写道:
> > > > > > > > 在 2019/10/8 下午7:33, Ville Syrjälä 写道:
> > > > > > > > > On Tue, Oct 08, 2019 at 10:40:20AM +0800, sandy.huang wrote:
> > > > > > > > > > Hi ville syrjala,
> > > > > > > > > > 
> > > > > > > > > > 在 2019/9/30 下午6:48, Ville Syrjälä 写道:
> > > > > > > > > > > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > > > > > > > > > > These new format is supported by some rockchip socs:
> > > > > > > > > > > > 
> > > > > > > > > > > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > > > > > > > > > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > > > > > > > > > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > > > > > > > > > > 
> > > > > > > > > > > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > > > > > > > > > > ---
> > > > > > > > > > > >       drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > > > > > > > > > > >       include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > > > > > > > > > > >       2 files changed, 32 insertions(+)
> > > > > > > > > > > > 
> > > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > index c630064..ccd78a3 100644
> > > > > > > > > > > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > > > > > > > > > > @@ -261,6 +261,24 @@ const struct drm_format_info
> > > > > > > > > > > > *__drm_format_info(u32 format)
> > > > > > > > > > > >               { .format = DRM_FORMAT_P016,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > >                 .char_per_block = { 2, 4, 0 }, .block_w = {
> > > > > > > > > > > > 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > > > > > > > > > > >                 .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV12_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV21_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 2, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV16_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV61_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 2, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV24_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > > +        { .format = DRM_FORMAT_NV42_10,        .depth =
> > > > > > > > > > > > 0,  .num_planes = 2,
> > > > > > > > > > > > +          .char_per_block = { 5, 10, 0 }, .block_w = {
> > > > > > > > > > > > 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > > > > > > > > > > +          .hsub = 1, .vsub = 1, .is_yuv = true},
> > > > > > > > > > > >               { .format = DRM_FORMAT_P210,        .depth = 0,
> > > > > > > > > > > >                 .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > > > > > > > > > > >                 .block_w = { 1, 0, 0 }, .block_h = { 1, 0,
> > > > > > > > > > > > 0 }, .hsub = 2,
> > > > > > > > > > > > diff --git a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > index 3feeaa3..08e2221 100644
> > > > > > > > > > > > --- a/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > +++ b/include/uapi/drm/drm_fourcc.h
> > > > > > > > > > > > @@ -238,6 +238,20 @@ extern "C" {
> > > > > > > > > > > >       #define DRM_FORMAT_NV42        fourcc_code('N', 'V',
> > > > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > > > >          /*
> > > > > > > > > > > > + * 2 plane YCbCr
> > > > > > > > > > > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > > > > > > > > > > + * index 1 = Cb:Cr plane,
> > > > > > > > > > > > Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > > > > > > > > > > + * or
> > > > > > > > > > > > + * index 1 = Cr:Cb plane,
> > > > > > > > > > > > Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > > > > > > > > > So now you're defining it as some kind of byte aligned block.
> > > > > > > > > > > With that specifying endianness would now make sense since
> > > > > > > > > > > otherwise this tells us absolutely nothing about the memory
> > > > > > > > > > > layout.
> > > > > > > > > > > 
> > > > > > > > > > > So I'd either do that, or go back to not specifying anything and
> > > > > > > > > > > use some weasel words like "mamory layout is implementation defined"
> > > > > > > > > > > which of course means no one can use it for anything that involves
> > > > > > > > > > > any kind of cross vendor stuff.
> > > > > > > > > > /*
> > > > > > > > > >       * 2 plane YCbCr
> > > > > > > > > >       * index 0 = Y plane, [39: 0] Y3:Y2:Y1:Y0 10:10:10:10 little endian
> > > > > > > > > >       * index 1 = Cb:Cr plane, [79: 0] Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0
> > > > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > > > >       * or
> > > > > > > > > >       * index 1 = Cr:Cb plane, [79: 0] Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0
> > > > > > > > > > 10:10:10:10:10:10:10:10  little endian
> > > > > > > > > >       */
> > > > > > > > > > 
> > > > > > > > > > Is this description ok?
> > > > > > > > > Seems OK to me, if it actually describes the format correctly.
> > > > > > > > > 
> > > > > > > > > Though I'm not sure why the CbCr is defines as an 80bit block
> > > > > > > > > and Y has a 40bit block. 40bits should be enough for CbCr as well.
> > > > > > > > > 
> > > > > > > > well, this is taken into account yuv444,  4 y point corresponding with 4
> > > > > > > > uv point.
> > > > > > > > 
> > > > > > > > if only describes the layout memory, here can change to 40bit block.
> > > > > > > > 
> > > > > > > > thanks.
> > > > > > > > 
> > > > > > > > > > > > + */
> > > > > > > > > > > > +#define DRM_FORMAT_NV12_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV21_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV16_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV61_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV24_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '2', '4') /* non-subsampled Cr:Cb plane */
> > > > > > > > > > > > +#define DRM_FORMAT_NV42_10    fourcc_code('N', 'A',
> > > > > > > > > > > > '4', '2') /* non-subsampled Cb:Cr plane */
> > > > > > > > > > > > +
> > > > > > > > > > > > +/*
> > > > > > > > > > > >        * 2 plane YCbCr MSB aligned
> > > > > > > > > > > >        * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > > > > > > > > > > >        * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x
> > > > > > > > > > > > [10:6:10:6] little endian
> > > > > > > > > > > > -- 
> > > > > > > > > > > > 2.7.4
> > > > > > > > > > > > 
> > > > > > > > > > > > 
> > > > > > > > > > > > 
> > > > > > > > > > > > _______________________________________________
> > > > > > > > > > > > dri-devel mailing list
> > > > > > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > > > > > > > _______________________________________________
> > > > > > > > dri-devel mailing list
> > > > > > > > dri-devel@lists.freedesktop.org
> > > > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Heiko Stübner Nov. 8, 2019, 3:08 p.m. UTC | #16
Hi Daniel, Sandy,

Am Mittwoch, 9. Oktober 2019, 16:50:08 CET schrieb Daniel Vetter:
> On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > These new format is supported by some rockchip socs:
> > 
> > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > 
> > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > ---
> >  drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> >  include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> >  2 files changed, 32 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> > index c630064..ccd78a3 100644
> > --- a/drivers/gpu/drm/drm_fourcc.c
> > +++ b/drivers/gpu/drm/drm_fourcc.c
> > @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
> >  		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
> >  		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
> >  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> > +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> >  		{ .format = DRM_FORMAT_P210,		.depth = 0,
> >  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
> >  		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> 
> Yup this is what I had in mind with using the block stuff to describe your
> new 10bit yuv formats. Thanks for respining.
> 
> Once we've nailed the exact bit description of the format precisely this
> can be merged imo.

I just saw this series still sitting in my inbox, so was wondering about the
"once we've nailed the exact bit description..." and what is missing for that.

Thanks
Heiko


> > diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> > index 3feeaa3..08e2221 100644
> > --- a/include/uapi/drm/drm_fourcc.h
> > +++ b/include/uapi/drm/drm_fourcc.h
> > @@ -238,6 +238,20 @@ extern "C" {
> >  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
> >  
> >  /*
> > + * 2 plane YCbCr
> > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > + * or
> > + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > + */
> > +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> > +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> > +
> > +/*
> >   * 2 plane YCbCr MSB aligned
> >   * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> >   * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
> 
>
Daniel Vetter Nov. 8, 2019, 4:37 p.m. UTC | #17
On Fri, Nov 08, 2019 at 04:08:50PM +0100, Heiko Stübner wrote:
> Hi Daniel, Sandy,
> 
> Am Mittwoch, 9. Oktober 2019, 16:50:08 CET schrieb Daniel Vetter:
> > On Thu, Sep 26, 2019 at 04:24:47PM +0800, Sandy Huang wrote:
> > > These new format is supported by some rockchip socs:
> > > 
> > > DRM_FORMAT_NV12_10/DRM_FORMAT_NV21_10
> > > DRM_FORMAT_NV16_10/DRM_FORMAT_NV61_10
> > > DRM_FORMAT_NV24_10/DRM_FORMAT_NV42_10
> > > 
> > > Signed-off-by: Sandy Huang <hjc@rock-chips.com>
> > > ---
> > >  drivers/gpu/drm/drm_fourcc.c  | 18 ++++++++++++++++++
> > >  include/uapi/drm/drm_fourcc.h | 14 ++++++++++++++
> > >  2 files changed, 32 insertions(+)
> > > 
> > > diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> > > index c630064..ccd78a3 100644
> > > --- a/drivers/gpu/drm/drm_fourcc.c
> > > +++ b/drivers/gpu/drm/drm_fourcc.c
> > > @@ -261,6 +261,24 @@ const struct drm_format_info *__drm_format_info(u32 format)
> > >  		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
> > >  		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
> > >  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 2, .vsub = 2, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 2, .vsub = 1, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> > > +		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
> > > +		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
> > > +		  .hsub = 1, .vsub = 1, .is_yuv = true},
> > >  		{ .format = DRM_FORMAT_P210,		.depth = 0,
> > >  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > >  		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> > 
> > Yup this is what I had in mind with using the block stuff to describe your
> > new 10bit yuv formats. Thanks for respining.
> > 
> > Once we've nailed the exact bit description of the format precisely this
> > can be merged imo.
> 
> I just saw this series still sitting in my inbox, so was wondering about the
> "once we've nailed the exact bit description..." and what is missing for that.

Since my name is on this mail ... what I meant here is that in principle
I'm ok, but someone else needs to check that we've documented all the
details properly. And once that review is done they or you can also merge
it. From my side not going to dig more into this, we have tons of
reviewers/committers.
-Daniel


> 
> Thanks
> Heiko
> 
> 
> > > diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> > > index 3feeaa3..08e2221 100644
> > > --- a/include/uapi/drm/drm_fourcc.h
> > > +++ b/include/uapi/drm/drm_fourcc.h
> > > @@ -238,6 +238,20 @@ extern "C" {
> > >  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
> > >  
> > >  /*
> > > + * 2 plane YCbCr
> > > + * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
> > > + * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
> > > + * or
> > > + * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
> > > + */
> > > +#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
> > > +#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
> > > +#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
> > > +#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
> > > +#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
> > > +#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
> > > +
> > > +/*
> > >   * 2 plane YCbCr MSB aligned
> > >   * index 0 = Y plane, [15:0] Y:x [10:6] little endian
> > >   * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
> > 
> > 
> 
> 
> 
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
index c630064..ccd78a3 100644
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -261,6 +261,24 @@  const struct drm_format_info *__drm_format_info(u32 format)
 		{ .format = DRM_FORMAT_P016,		.depth = 0,  .num_planes = 2,
 		  .char_per_block = { 2, 4, 0 }, .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 },
 		  .hsub = 2, .vsub = 2, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV12_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 2, .vsub = 2, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV21_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 2, .vsub = 2, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV16_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 2, .vsub = 1, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV61_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 2, .vsub = 1, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV24_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 1, .vsub = 1, .is_yuv = true},
+		{ .format = DRM_FORMAT_NV42_10,		.depth = 0,  .num_planes = 2,
+		  .char_per_block = { 5, 10, 0 }, .block_w = { 4, 4, 0 }, .block_h = { 4, 4, 0 },
+		  .hsub = 1, .vsub = 1, .is_yuv = true},
 		{ .format = DRM_FORMAT_P210,		.depth = 0,
 		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
 		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 3feeaa3..08e2221 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -238,6 +238,20 @@  extern "C" {
 #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
 
 /*
+ * 2 plane YCbCr
+ * index 0 = Y plane, Y3:Y2:Y1:Y0 10:10:10:10
+ * index 1 = Cb:Cr plane, Cb3:Cr3:Cb2:Cr2:Cb1:Cr1:Cb0:Cr0 10:10:10:10:10:10:10:10
+ * or
+ * index 1 = Cr:Cb plane, Cr3:Cb3:Cr2:Cb2:Cr1:Cb1:Cr0:Cb0 10:10:10:10:10:10:10:10
+ */
+#define DRM_FORMAT_NV12_10	fourcc_code('N', 'A', '1', '2') /* 2x2 subsampled Cr:Cb plane */
+#define DRM_FORMAT_NV21_10	fourcc_code('N', 'A', '2', '1') /* 2x2 subsampled Cb:Cr plane */
+#define DRM_FORMAT_NV16_10	fourcc_code('N', 'A', '1', '6') /* 2x1 subsampled Cr:Cb plane */
+#define DRM_FORMAT_NV61_10	fourcc_code('N', 'A', '6', '1') /* 2x1 subsampled Cb:Cr plane */
+#define DRM_FORMAT_NV24_10	fourcc_code('N', 'A', '2', '4') /* non-subsampled Cr:Cb plane */
+#define DRM_FORMAT_NV42_10	fourcc_code('N', 'A', '4', '2') /* non-subsampled Cb:Cr plane */
+
+/*
  * 2 plane YCbCr MSB aligned
  * index 0 = Y plane, [15:0] Y:x [10:6] little endian
  * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian