Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cc061c4 authored by Narender Ankam's avatar Narender Ankam Committed by Gerrit - the friendly Code Review server
Browse files

drm/edid: use DC flags to indicate deep color support 



DRM EDID parser is using same flags to indicate RGB/YCBCR444 support
and also to indicate deep color support for RGB/YCBCR444 formats.
Use DC flags like
DRM_COLOR_FORMAT_DC_RGB444 instead of DRM_COLOR_FORMAT_RGB444
DRM_COLOR_FORMAT_DC_YCRCB444 instead of DRM_COLOR_FORMAT_YCRCB444
to indicate DC support.

Change-Id: Ia6370c6328655d17199597c3c7303a68d9448c0b
Signed-off-by: default avatarNarender Ankam <nankam@codeaurora.org>
parent fac768d6

drivers/gpu/drm/drm_edid.c

+17 −17
Original line number Diff line number Diff line
@@ -1174,72 +1174,72 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 95 - 3840x2160p@30Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 96 - 3840x2160p@50Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 97 - 3840x2160p@60Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 98 - 4096x2160p@24Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,

		5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 99 - 4096x2160p@25Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,

		5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 100 - 4096x2160p@30Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 4184,

		4272, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 101 - 4096x2160p@50Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,

		5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 102 - 4096x2160p@60Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 4184,

		4272, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 103 - 3840x2160p@24Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

		5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 104 - 3840x2160p@25Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 105 - 3840x2160p@30Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 106 - 3840x2160p@50Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 107 - 3840x2160p@60Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

};



/*
@@ -4313,11 +4313,11 @@ static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector, 
	 * modes and forbids YCRCB422 support for all video modes per

	 * HDMI 1.3 spec.

	 */

	info->color_formats = DRM_COLOR_FORMAT_RGB444;

	info->color_formats |= DRM_COLOR_FORMAT_DC_RGB444;



	/* YCRCB444 is optional according to spec. */

	if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) {

		info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;

		info->color_formats |= DRM_COLOR_FORMAT_DC_YCRCB444;

		DRM_DEBUG("%s: HDMI sink does YCRCB444 in deep color.\n",

			  connector->name);

	}

include/drm/drm_connector.h

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,12 @@ struct drm_display_info { 
	 */

	unsigned int bpc;



	/**

	 * @bpc: Maximum bits per color channel for YCbCr420 modes.

	 * Used by HDMI and DP outputs.

	 */

	unsigned int y420_bpc;



	/**

	 * @subpixel_order: Subpixel order of LCD panels.

	 */
@@ -133,6 +139,8 @@ struct drm_display_info { 
#define DRM_COLOR_FORMAT_RGB444		(1<<0)

#define DRM_COLOR_FORMAT_YCRCB444	(1<<1)

#define DRM_COLOR_FORMAT_YCRCB422	(1<<2)

#define DRM_COLOR_FORMAT_DC_RGB444	(1<<3)

#define DRM_COLOR_FORMAT_DC_YCRCB444	(1<<4)



	/**

	 * @color_formats: HDMI Color formats, selects between RGB and YCrCb