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

Commit afa1c763 authored by Shashank Sharma's avatar Shashank Sharma Committed by Jani Nikula
Browse files

drm/edid: detect SCDC support in HF-VSDB 



This patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info.
  This structure will be used to save and indicate if sink
  supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to
  reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it
  in scdc structure
- If SCDC is present, checks if sink is capable of generating
  SCDC read request, and marks it in scdc structure.

V2: Addressed review comments
 Thierry:
 - Fix typos in commit message and make abbreviation consistent
   across the commit message.
 - Change structure object name from hdmi_info -> hdmi
 - Fix typos and abbreviations in description of structure drm_hdmi_info
   end the description with a full stop.
 - Create a structure drm_scdc, and keep all information related to SCDC
   register set (supported, read request supported) etc in it.

Ville:
 - Change rr -> read_request
 - Call drm_detect_scrambling function drm_parse_hf_vsdb so that all
   of HF-VSDB parsing can be kept in same function, in incremental
   patches.

V3: Rebase.
V4: Rebase.
V5: Rebase.
V6: Rebase.
V7: Added R-B from Jose.
V8: Rebase.
V9: Rebase.
V10: Rebase.

Signed-off-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-4-git-send-email-shashank.sharma@intel.com
parent 50dd1bd1

drivers/gpu/drm/drm_edid.c

+14 −0
Original line number Diff line number Diff line
@@ -3814,6 +3814,18 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode) 
}

EXPORT_SYMBOL(drm_default_rgb_quant_range);



static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector,

				 const u8 *hf_vsdb)

{

	struct drm_hdmi_info *hdmi = &connector->display_info.hdmi;



	if (hf_vsdb[6] & 0x80) {

		hdmi->scdc.supported = true;

		if (hf_vsdb[6] & 0x40)

			hdmi->scdc.read_request = true;

	}

}



static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,

					   const u8 *hdmi)

{
@@ -3928,6 +3940,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector, 


		if (cea_db_is_hdmi_vsdb(db))

			drm_parse_hdmi_vsdb_video(connector, db);

		if (cea_db_is_hdmi_forum_vsdb(db))

			drm_parse_hdmi_forum_vsdb(connector, db);

	}

}

include/drm/drm_connector.h

+33 −0
Original line number Diff line number Diff line
@@ -87,6 +87,34 @@ enum subpixel_order { 
	SubPixelVerticalRGB,

	SubPixelVerticalBGR,

	SubPixelNone,



};



/*

 * struct drm_scdc - Information about scdc capabilities of a HDMI 2.0 sink

 *

 * Provides SCDC register support and capabilities related information on a

 * HDMI 2.0 sink. In case of a HDMI 1.4 sink, all parameter must be 0.

 */

struct drm_scdc {

	/**

	 * @supported: status control & data channel present.

	 */

	bool supported;

	/**

	 * @read_request: sink is capable of generating scdc read request.

	 */

	bool read_request;

};



/**

 * struct drm_hdmi_info - runtime information about the connected HDMI sink

 *

 * Describes if a given display supports advanced HDMI 2.0 features.

 * This information is available in CEA-861-F extension blocks (like HF-VSDB).

 */

struct drm_hdmi_info {

	struct drm_scdc scdc;

};



/**
@@ -204,6 +232,11 @@ struct drm_display_info { 
	 * @cea_rev: CEA revision of the HDMI sink.

	 */

	u8 cea_rev;



	/**

	 * @hdmi: advance features of a HDMI sink.

	 */

	struct drm_hdmi_info hdmi;

};



int drm_display_info_set_bus_formats(struct drm_display_info *info,