[PATCH v2 1/6] drm/displayid: re-align data block macros

[Shankar, Uma]

> -----Original Message-----
> From: dri-devel <dri-devel-bounces at lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, August 31, 2021 7:48 PM
> To: intel-gfx at lists.freedesktop.org
> Cc: dri-devel at lists.freedesktop.org; ville.syrjala at linux.intel.com; Nikula, Jani
> <jani.nikula at intel.com>
> Subject: [PATCH v2 1/6] drm/displayid: re-align data block macros
> 
> Make the values easier to read. Also add DisplayID Structure version and revision
> information (this is different from the spec version).

Looks ok to me.
Reviewed-by: Uma Shankar <uma.shankar at intel.com>

> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  include/drm/drm_displayid.h | 57 +++++++++++++++++++------------------
>  1 file changed, 29 insertions(+), 28 deletions(-)
> 
> diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h index
> ec64d141f578..0ed9445b5482 100644
> --- a/include/drm/drm_displayid.h
> +++ b/include/drm/drm_displayid.h
> @@ -26,35 +26,36 @@
> 
>  struct edid;
> 
> -#define DATA_BLOCK_PRODUCT_ID 0x00
> -#define DATA_BLOCK_DISPLAY_PARAMETERS 0x01 -#define
> DATA_BLOCK_COLOR_CHARACTERISTICS 0x02 -#define
> DATA_BLOCK_TYPE_1_DETAILED_TIMING 0x03 -#define
> DATA_BLOCK_TYPE_2_DETAILED_TIMING 0x04 -#define
> DATA_BLOCK_TYPE_3_SHORT_TIMING 0x05 -#define
> DATA_BLOCK_TYPE_4_DMT_TIMING 0x06 -#define DATA_BLOCK_VESA_TIMING
> 0x07 -#define DATA_BLOCK_CEA_TIMING 0x08 -#define
> DATA_BLOCK_VIDEO_TIMING_RANGE 0x09 -#define
> DATA_BLOCK_PRODUCT_SERIAL_NUMBER 0x0a -#define
> DATA_BLOCK_GP_ASCII_STRING 0x0b -#define
> DATA_BLOCK_DISPLAY_DEVICE_DATA 0x0c -#define
> DATA_BLOCK_INTERFACE_POWER_SEQUENCING 0x0d -#define
> DATA_BLOCK_TRANSFER_CHARACTERISTICS 0x0e -#define
> DATA_BLOCK_DISPLAY_INTERFACE 0x0f -#define
> DATA_BLOCK_STEREO_DISPLAY_INTERFACE 0x10 -#define
> DATA_BLOCK_TILED_DISPLAY 0x12 -#define DATA_BLOCK_CTA 0x81
> +/* DisplayID Structure v1r2 Data Blocks */
> +#define DATA_BLOCK_PRODUCT_ID			0x00
> +#define DATA_BLOCK_DISPLAY_PARAMETERS		0x01
> +#define DATA_BLOCK_COLOR_CHARACTERISTICS	0x02
> +#define DATA_BLOCK_TYPE_1_DETAILED_TIMING	0x03
> +#define DATA_BLOCK_TYPE_2_DETAILED_TIMING	0x04
> +#define DATA_BLOCK_TYPE_3_SHORT_TIMING		0x05
> +#define DATA_BLOCK_TYPE_4_DMT_TIMING		0x06
> +#define DATA_BLOCK_VESA_TIMING			0x07
> +#define DATA_BLOCK_CEA_TIMING			0x08
> +#define DATA_BLOCK_VIDEO_TIMING_RANGE		0x09
> +#define DATA_BLOCK_PRODUCT_SERIAL_NUMBER	0x0a
> +#define DATA_BLOCK_GP_ASCII_STRING		0x0b
> +#define DATA_BLOCK_DISPLAY_DEVICE_DATA		0x0c
> +#define DATA_BLOCK_INTERFACE_POWER_SEQUENCING	0x0d
> +#define DATA_BLOCK_TRANSFER_CHARACTERISTICS	0x0e
> +#define DATA_BLOCK_DISPLAY_INTERFACE		0x0f
> +#define DATA_BLOCK_STEREO_DISPLAY_INTERFACE	0x10
> +#define DATA_BLOCK_TILED_DISPLAY		0x12
> +#define DATA_BLOCK_VENDOR_SPECIFIC		0x7f
> +#define DATA_BLOCK_CTA				0x81
> 
> -#define DATA_BLOCK_VENDOR_SPECIFIC 0x7f
> -
> -#define PRODUCT_TYPE_EXTENSION 0
> -#define PRODUCT_TYPE_TEST 1
> -#define PRODUCT_TYPE_PANEL 2
> -#define PRODUCT_TYPE_MONITOR 3
> -#define PRODUCT_TYPE_TV 4
> -#define PRODUCT_TYPE_REPEATER 5
> -#define PRODUCT_TYPE_DIRECT_DRIVE 6
> +/* DisplayID Structure v1r2 Product Type */
> +#define PRODUCT_TYPE_EXTENSION			0
> +#define PRODUCT_TYPE_TEST			1
> +#define PRODUCT_TYPE_PANEL			2
> +#define PRODUCT_TYPE_MONITOR			3
> +#define PRODUCT_TYPE_TV				4
> +#define PRODUCT_TYPE_REPEATER			5
> +#define PRODUCT_TYPE_DIRECT_DRIVE		6
> 
>  struct displayid_header {
>  	u8 rev;
> --
> 2.30.2