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

Commit 0e5083aa authored by Thomas Wood's avatar Thomas Wood Committed by Daniel Vetter
Browse files

drm/edid: parse the list of additional 3D modes 



Parse 2D_VIC_order_X and 3D_Structure_X from the list at the end of the
HDMI Vendor Specific Data Block.

v2: Use an offset value depending on 3D_Multi_present and add
    detail_present. (Ville Syrjälä)
v3: Make sure the list is parsed even if 3D_Structure_ALL/MASK is not
    present. (Ville Syrjälä)
    Fix one length check and remove another. (Ville Syrjälä)

Signed-off-by: default avatarThomas Wood <thomas.wood@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent aff04ace

drivers/gpu/drm/drm_edid.c

+73 −21
Original line number Diff line number Diff line
@@ -2739,7 +2739,7 @@ static int 
do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,

		   const u8 *video_db, u8 video_len)

{

	int modes = 0, offset = 0, i, multi_present = 0;

	int modes = 0, offset = 0, i, multi_present = 0, multi_len;

	u8 vic_len, hdmi_3d_len = 0;

	u16 mask;

	u16 structure_all;
@@ -2785,17 +2785,20 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len, 
	}

	offset += 1 + vic_len;



	if (!(multi_present == 1 || multi_present == 2))

		goto out;

	if (multi_present == 1)

		multi_len = 2;

	else if (multi_present == 2)

		multi_len = 4;

	else

		multi_len = 0;



	if ((multi_present == 1 && len < (9 + offset)) ||

	    (multi_present == 2 && len < (11 + offset)))

	if (len < (8 + offset + hdmi_3d_len - 1))

		goto out;



	if ((multi_present == 1 && hdmi_3d_len < 2) ||

	    (multi_present == 2 && hdmi_3d_len < 4))

	if (hdmi_3d_len < multi_len)

		goto out;



	if (multi_present == 1 || multi_present == 2) {

		/* 3D_Structure_ALL */

		structure_all = (db[8 + offset] << 8) | db[9 + offset];
@@ -2812,6 +2815,55 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len, 
						video_db,

						video_len, i);

		}

	}



	offset += multi_len;



	for (i = 0; i < (hdmi_3d_len - multi_len); i++) {

		int vic_index;

		struct drm_display_mode *newmode = NULL;

		unsigned int newflag = 0;

		bool detail_present;



		detail_present = ((db[8 + offset + i] & 0x0f) > 7);



		if (detail_present && (i + 1 == hdmi_3d_len - multi_len))

			break;



		/* 2D_VIC_order_X */

		vic_index = db[8 + offset + i] >> 4;



		/* 3D_Structure_X */

		switch (db[8 + offset + i] & 0x0f) {

		case 0:

			newflag = DRM_MODE_FLAG_3D_FRAME_PACKING;

			break;

		case 6:

			newflag = DRM_MODE_FLAG_3D_TOP_AND_BOTTOM;

			break;

		case 8:

			/* 3D_Detail_X */

			if ((db[9 + offset + i] >> 4) == 1)

				newflag = DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF;

			break;

		}



		if (newflag != 0) {

			newmode = drm_display_mode_from_vic_index(connector,

								  video_db,

								  video_len,

								  vic_index);



			if (newmode) {

				newmode->flags |= newflag;

				drm_mode_probed_add(connector, newmode);

				modes++;

			}

		}



		if (detail_present)

			i++;

	}



out:

	return modes;