drm/fourcc: Add Arm 16x16 block modifier
Subsystems (2)
PATCH v2 1/1 drm/fourcc: Add Arm 16x16 block modifier
Add the DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED modifier to denote the 16x16 block u-interleaved format used in Arm Utgard and Midgard GPUs.
Changes from v1:-
1. Reserved the upper four bits (out of the 56 bits assigned to each vendor) to denote the category of Arm specific modifiers. Currently, we have two categories ie AFBC and MISC.
--- include/uapi/drm/drm_fourcc.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
include/uapi/drm/drm_fourcc.h +26 -1
@@ -648,7 +648,21 @@ extern "C" {* Further information on the use of AFBC modifiers can be found in * Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* +* The top 4 bits (out of the 56 bits alloted for specifying vendor specific +* modifiers) denote the category for modifiers. Currently we have only two +* categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen +* different categories. +*/ +#define DRM_FORMAT_MOD_ARM_CODE (type, val) \ + fourcc_mod_code(ARM, ((__u64)type << 52) | ((val) & 0x000fffffffffffffULL)) + +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode)/* * AFBC superblock size
@@ -742,6 +756,17 @@ extern "C" {*/ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/* +* Arm 16x16 Block U-Interleaved modifier +* +* This is used by Arm Mali Utgard and Midgard GPUs. It divides the image +* into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels +* in the block are reordered. +*/ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) + +/* * Allwinner tiled modifier *
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Ayan,
Could we preserve Ray's authorship on this patch?
Quoted 21 lines · Ayan Halder
Add the
DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVEDmodifier to denote the 16x16 block u-interleaved format used in Arm Utgard and Midgard GPUs.Changes from v1:-
1. Reserved the upper four bits (out of the 56 bits assigned to each vendor) to denote the category of Arm specific modifiers. Currently, we have two categories ie AFBC and MISC.Signed-off-by Raymond Smith <[email protected]>Signed-off-by Ayan kumar halder <[email protected]>--- include/uapi/drm/drm_fourcc.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)include/uapi/drm/drm_fourcc.h +0
-0@@ -648,7 +648,21 @@ extern "C" {* Further information on the use of AFBC modifiers can be found in
include/uapi/drm/drm_fourcc.h extern "C" { · line 657
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +7
-1* Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* +* The top 4 bits (out of the 56 bits alloted for specifying vendor specific +* modifiers) denote the category for modifiers. Currently we have only two +* categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen +* different categories. +*/
Yeah, this makes more sense than getting crazy with saving bits. Sorry Qiang/Daniel for not just going with this in the first instance when you both suggested it.
include/uapi/drm/drm_fourcc.h extern "C" { · line 659
Quoted 2 lines
include/uapi/drm/drm_fourcc.h +2
-0+#define DRM_FORMAT_MOD_ARM_CODE (type, val) \ + fourcc_mod_code(ARM, ((__u64)type << 52) | ((val) & 0x000fffffffffffffULL))
Not a big deal, but I might prefix type and val with "__" to reduce the chance of name collisions with code using the macro:DRM_FORMAT_MOD_ARM_CODE(__type, __val).
Quoted 14 lines
include/uapi/drm/drm_fourcc.h +7
-0+ +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode)/* * AFBC superblock size @@ -742,6 +756,17 @@ extern "C" {*/ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/*
include/uapi/drm/drm_fourcc.h extern "C" { · line 769
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +10
-0+* Arm 16x16 Block U-Interleaved modifier +* +* This is used by Arm Mali Utgard and Midgard GPUs. It divides the image +* into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels +* in the block are reordered. +*/ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) + +
I think you can drop this newline, there's no extra space between any of the other definitions.
With this line dropped, and if you fix up the author:
Thanks for the respin,
-Brian
Quoted 6 lines
include/uapi/drm/drm_fourcc.h +0
-0/* * Allwinner tiled modifier * Signature · 1 line
2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 3 lines · Brian Starkey
Hi Ayan,
Could we preserve Ray's authorship on this patch?
Apologies for this, I will definitely preserve Ray's authorship in the v3 patch.
Quoted 73 lines · Ayan Halder
Quoted 21 lines
Add the
DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVEDmodifier to denote the 16x16 block u-interleaved format used in Arm Utgard and Midgard GPUs.Changes from v1:-
1. Reserved the upper four bits (out of the 56 bits assigned to each vendor) to denote the category of Arm specific modifiers. Currently, we have two categories ie AFBC and MISC.Signed-off-by Raymond Smith <[email protected]>Signed-off-by Ayan kumar halder <[email protected]>--- include/uapi/drm/drm_fourcc.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)include/uapi/drm/drm_fourcc.h +0
-0@@ -648,7 +648,21 @@ extern "C" {* Further information on the use of AFBC modifiers can be found in include/uapi/drm/drm_fourcc.h extern "C" { · line 657
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +7
-1* Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* +* The top 4 bits (out of the 56 bits alloted for specifying vendor specific +* modifiers) denote the category for modifiers. Currently we have only two +* categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen +* different categories. +*/ Yeah, this makes more sense than getting crazy with saving bits. Sorry Qiang/Daniel for not just going with this in the first instance when you both suggested it.
include/uapi/drm/drm_fourcc.h extern "C" { · line 659
Quoted 2 lines
include/uapi/drm/drm_fourcc.h +2
-0+#define DRM_FORMAT_MOD_ARM_CODE (type, val) \ + fourcc_mod_code(ARM, ((__u64)type << 52) | ((val) & 0x000fffffffffffffULL))Not a big deal, but I might prefix type and val with "__" to reduce the chance of name collisions with code using the macro:
DRM_FORMAT_MOD_ARM_CODE(__type, __val).Quoted 14 lines
include/uapi/drm/drm_fourcc.h +7
-0+ +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode)/* * AFBC superblock size @@ -742,6 +756,17 @@ extern "C" {*/ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/* include/uapi/drm/drm_fourcc.h extern "C" { · line 769
Quoted 10 lines
include/uapi/drm/drm_fourcc.h +10
-0+* Arm 16x16 Block U-Interleaved modifier +* +* This is used by Arm Mali Utgard and Midgard GPUs. It divides the image +* into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels +* in the block are reordered. +*/ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) + +I think you can drop this newline, there's no extra space between any of the other definitions.
Quoted 5 lines
With this line dropped, and if you fix up the author:
Reviewed-by Brian Starkey <[email protected]>Thanks for the respin,
I will wait for [email protected] and [email protected] comments before respinning the patch.
Quoted 8 lines
-Brian
Quoted 6 lines
include/uapi/drm/drm_fourcc.h +0
-0/* * Allwinner tiled modifier * Signature · 1 line
2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Ayan,
Thanks for the patch. I'm OK with either the static reserved type way or the previous dynamic way. So this patch is:
PS. for anyone would like to know the usage of this modifier, lima mesa driver need this modifier to denote some tiled texture format and shared between client and display server.
Regards,
Qiang
Quoted 64 lines · Ayan Halder
Add the
DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVEDmodifier to denote the 16x16 block u-interleaved format used in Arm Utgard and Midgard GPUs.Changes from v1:-
1. Reserved the upper four bits (out of the 56 bits assigned to each vendor) to denote the category of Arm specific modifiers. Currently, we have two categories ie AFBC and MISC.Signed-off-by Raymond Smith <[email protected]>Signed-off-by Ayan kumar halder <[email protected]>--- include/uapi/drm/drm_fourcc.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)include/uapi/drm/drm_fourcc.h +26
-2@@ -648,7 +648,21 @@ extern "C" {* Further information on the use of AFBC modifiers can be found in * Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* +* The top 4 bits (out of the 56 bits alloted for specifying vendor specific +* modifiers) denote the category for modifiers. Currently we have only two +* categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen +* different categories. +*/ +#define DRM_FORMAT_MOD_ARM_CODE (type, val) \ + fourcc_mod_code(ARM, ((__u64)type << 52) | ((val) & 0x000fffffffffffffULL)) + +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode)/* * AFBC superblock size @@ -742,6 +756,17 @@ extern "C" {*/ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/* +* Arm 16x16 Block U-Interleaved modifier +* +* This is used by Arm Mali Utgard and Midgard GPUs. It divides the image +* into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels +* in the block are reordered. +*/ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) + +/* * Allwinner tiled modifier * -- 2.23.0