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

Commit 3864a8ac authored by Abhinav Kumar's avatar Abhinav Kumar
Browse files

drm/msm: fix Y420CMDB EDID block parsing 



Fix the Y420CMDB EDID block parsing to handle
the case where the block does not include a capability
bitmap.

This case means that all the short video descriptors
support the YUV 420 mode as well.

Also fix the incorrect length check in the parser API.
The capability bitmap has no minimum length field.

Change-Id: I5d9c2d3ac11d5ddad8e36cb7acfebfb41175f4b7
Signed-off-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
parent 4bf2e9f4

drivers/gpu/drm/msm/sde_edid_parser.c

+21 −12
Original line number Diff line number Diff line
@@ -229,10 +229,17 @@ u32 video_format) 
{

	u8 cea_mode = 0;

	struct drm_display_mode *mode;

	u32 mode_fmt_flags = 0;



	/* Need to add Y420 support flag to the modes */

	list_for_each_entry(mode, &connector->probed_modes, head) {

		/* Cache the format flags before clearing */

		mode_fmt_flags = mode->flags;

		/* Clear the RGB/YUV format flags before calling upstream API */

		mode->flags &= ~SDE_DRM_MODE_FLAG_FMT_MASK;

		cea_mode = drm_match_cea_mode(mode);

		/* Restore the format flags */

		mode->flags = mode_fmt_flags;

		if ((cea_mode != 0) && (cea_mode == video_format)) {

			SDE_EDID_DEBUG("%s found match for %d ", __func__,

			video_format);
@@ -246,7 +253,7 @@ struct drm_connector *connector, struct sde_edid_ctrl *edid_ctrl, 
const u8 *db)

{

	u32 offset = 0;

	u8 len = 0;

	u8 cmdb_len = 0;

	u8 svd_len = 0;

	const u8 *svd = NULL;

	u32 i = 0, j = 0;
@@ -262,10 +269,8 @@ const u8 *db) 
		return;

	}

	SDE_EDID_DEBUG("%s +\n", __func__);

	len = db[0] & 0x1f;

	cmdb_len = db[0] & 0x1f;



	if (len < 7)

		return;

	/* Byte 3 to L+1 contain SVDs */

	offset += 2;
@@ -273,22 +278,26 @@ const u8 *db) 


	if (svd) {

		/*moving to the next byte as vic info begins there*/

		++svd;

		svd_len = svd[0] & 0x1f;

		++svd;

	}



	for (i = 0; i < svd_len; i++, j++) {

		video_format = *svd & 0x7F;

		if (db[offset] & (1 << j))

		video_format = *(svd + i) & 0x7F;

		if (cmdb_len == 1) {

			/* If cmdb_len is 1, it means all SVDs support YUV */

			sde_edid_set_y420_support(connector, video_format);

		} else if (db[offset] & (1 << j)) {

			sde_edid_set_y420_support(connector, video_format);



			if (j & 0x80) {

				j = j/8;

				offset++;

			if (offset >= len)

				if (offset >= cmdb_len)

					break;

			}

		}

	}



	SDE_EDID_DEBUG("%s -\n", __func__);

drivers/gpu/drm/msm/sde_edid_parser.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define SDE_CEA_EXT    0x02

#define SDE_EXTENDED_TAG 0x07



#define SDE_DRM_MODE_FLAG_FMT_MASK (0x3 << 20)



enum extended_data_block_types {

	VIDEO_CAPABILITY_DATA_BLOCK = 0x0,

	VENDOR_SPECIFIC_VIDEO_DATA_BLOCK = 0x01,