include/uapi: Update drm_fourcc.h from kernel
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> v2. Pull in the header from drm-next at commit 9035039e1ed691cd893777a42e048003a2f349d6 Cc: 22.1 <mesa-stable> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14521>
This commit is contained in:
parent
2bc8c61fd0
commit
acba3efe69
|
@ -104,6 +104,12 @@ extern "C" {
|
||||||
/* 8 bpp Red */
|
/* 8 bpp Red */
|
||||||
#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */
|
#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */
|
||||||
|
|
||||||
|
/* 10 bpp Red */
|
||||||
|
#define DRM_FORMAT_R10 fourcc_code('R', '1', '0', ' ') /* [15:0] x:R 6:10 little endian */
|
||||||
|
|
||||||
|
/* 12 bpp Red */
|
||||||
|
#define DRM_FORMAT_R12 fourcc_code('R', '1', '2', ' ') /* [15:0] x:R 4:12 little endian */
|
||||||
|
|
||||||
/* 16 bpp Red */
|
/* 16 bpp Red */
|
||||||
#define DRM_FORMAT_R16 fourcc_code('R', '1', '6', ' ') /* [15:0] R little endian */
|
#define DRM_FORMAT_R16 fourcc_code('R', '1', '6', ' ') /* [15:0] R little endian */
|
||||||
|
|
||||||
|
@ -308,6 +314,13 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
#define DRM_FORMAT_P016 fourcc_code('P', '0', '1', '6') /* 2x2 subsampled Cr:Cb plane 16 bits per channel */
|
#define DRM_FORMAT_P016 fourcc_code('P', '0', '1', '6') /* 2x2 subsampled Cr:Cb plane 16 bits per channel */
|
||||||
|
|
||||||
|
/* 2 plane YCbCr420.
|
||||||
|
* 3 10 bit components and 2 padding bits packed into 4 bytes.
|
||||||
|
* index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
|
||||||
|
* index 1 = Cr:Cb plane, [63:0] x:Cr2:Cb2:Cr1:x:Cb1:Cr0:Cb0 [2:10:10:10:2:10:10:10] little endian
|
||||||
|
*/
|
||||||
|
#define DRM_FORMAT_P030 fourcc_code('P', '0', '3', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel packed */
|
||||||
|
|
||||||
/* 3 plane non-subsampled (444) YCbCr
|
/* 3 plane non-subsampled (444) YCbCr
|
||||||
* 16 bits per component, but only 10 bits are used and 6 bits are padded
|
* 16 bits per component, but only 10 bits are used and 6 bits are padded
|
||||||
* index 0: Y plane, [15:0] Y:x [10:6] little endian
|
* index 0: Y plane, [15:0] Y:x [10:6] little endian
|
||||||
|
@ -373,6 +386,12 @@ extern "C" {
|
||||||
|
|
||||||
#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)
|
#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)
|
||||||
|
|
||||||
|
#define fourcc_mod_get_vendor(modifier) \
|
||||||
|
(((modifier) >> 56) & 0xff)
|
||||||
|
|
||||||
|
#define fourcc_mod_is_vendor(modifier, vendor) \
|
||||||
|
(fourcc_mod_get_vendor(modifier) == DRM_FORMAT_MOD_VENDOR_## vendor)
|
||||||
|
|
||||||
#define fourcc_mod_code(vendor, val) \
|
#define fourcc_mod_code(vendor, val) \
|
||||||
((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL))
|
((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL))
|
||||||
|
|
||||||
|
@ -553,6 +572,53 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8)
|
#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Intel Tile 4 layout
|
||||||
|
*
|
||||||
|
* This is a tiled layout using 4KB tiles in a row-major layout. It has the same
|
||||||
|
* shape as Tile Y at two granularities: 4KB (128B x 32) and 64B (16B x 4). It
|
||||||
|
* only differs from Tile Y at the 256B granularity in between. At this
|
||||||
|
* granularity, Tile Y has a shape of 16B x 32 rows, but this tiling has a shape
|
||||||
|
* of 64B x 8 rows.
|
||||||
|
*/
|
||||||
|
#define I915_FORMAT_MOD_4_TILED fourcc_mod_code(INTEL, 9)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Intel color control surfaces (CCS) for DG2 render compression.
|
||||||
|
*
|
||||||
|
* The main surface is Tile 4 and at plane index 0. The CCS data is stored
|
||||||
|
* outside of the GEM object in a reserved memory area dedicated for the
|
||||||
|
* storage of the CCS data for all RC/RC_CC/MC compressible GEM objects. The
|
||||||
|
* main surface pitch is required to be a multiple of four Tile 4 widths.
|
||||||
|
*/
|
||||||
|
#define I915_FORMAT_MOD_4_TILED_DG2_RC_CCS fourcc_mod_code(INTEL, 10)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Intel color control surfaces (CCS) for DG2 media compression.
|
||||||
|
*
|
||||||
|
* The main surface is Tile 4 and at plane index 0. For semi-planar formats
|
||||||
|
* like NV12, the Y and UV planes are Tile 4 and are located at plane indices
|
||||||
|
* 0 and 1, respectively. The CCS for all planes are stored outside of the
|
||||||
|
* GEM object in a reserved memory area dedicated for the storage of the
|
||||||
|
* CCS data for all RC/RC_CC/MC compressible GEM objects. The main surface
|
||||||
|
* pitch is required to be a multiple of four Tile 4 widths.
|
||||||
|
*/
|
||||||
|
#define I915_FORMAT_MOD_4_TILED_DG2_MC_CCS fourcc_mod_code(INTEL, 11)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Intel Color Control Surface with Clear Color (CCS) for DG2 render compression.
|
||||||
|
*
|
||||||
|
* The main surface is Tile 4 and at plane index 0. The CCS data is stored
|
||||||
|
* outside of the GEM object in a reserved memory area dedicated for the
|
||||||
|
* storage of the CCS data for all RC/RC_CC/MC compressible GEM objects. The
|
||||||
|
* main surface pitch is required to be a multiple of four Tile 4 widths. The
|
||||||
|
* clear color is stored at plane index 1 and the pitch should be ignored. The
|
||||||
|
* format of the 256 bits of clear color data matches the one used for the
|
||||||
|
* I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC modifier, see its description
|
||||||
|
* for details.
|
||||||
|
*/
|
||||||
|
#define I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC fourcc_mod_code(INTEL, 12)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks
|
* Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks
|
||||||
*
|
*
|
||||||
|
@ -736,7 +802,7 @@ extern "C" {
|
||||||
* which corresponds to the "generic" kind used for simple single-sample
|
* which corresponds to the "generic" kind used for simple single-sample
|
||||||
* uncompressed color formats on Fermi - Volta GPUs.
|
* uncompressed color formats on Fermi - Volta GPUs.
|
||||||
*/
|
*/
|
||||||
static __inline__ __u64
|
static inline __u64
|
||||||
drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
|
drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
|
||||||
{
|
{
|
||||||
if (!(modifier & 0x10) || (modifier & (0xff << 12)))
|
if (!(modifier & 0x10) || (modifier & (0xff << 12)))
|
||||||
|
@ -842,6 +908,10 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
|
||||||
* and UV. Some SAND-using hardware stores UV in a separate tiled
|
* and UV. Some SAND-using hardware stores UV in a separate tiled
|
||||||
* image from Y to reduce the column height, which is not supported
|
* image from Y to reduce the column height, which is not supported
|
||||||
* with these modifiers.
|
* with these modifiers.
|
||||||
|
*
|
||||||
|
* The DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT modifier is also
|
||||||
|
* supported for DRM_FORMAT_P030 where the columns remain as 128 bytes
|
||||||
|
* wide, but as this is a 10 bpp format that translates to 96 pixels.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \
|
#define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \
|
||||||
|
|
Loading…
Reference in New Issue