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

Commit de64b554 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/edid: add support for parsing quantization select field"

parents 3f5958b2 fc8b7422

drivers/gpu/drm/drm_edid.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -3526,11 +3526,17 @@ drm_extract_vcdb_info(struct drm_connector *connector, const u8 *db) 
		(db[2] & (BIT(3) | BIT(2))) >> 2;

		(db[2] & (BIT(3) | BIT(2))) >> 2;

	connector->ce_scan_info =

	connector->ce_scan_info =

		db[2] & (BIT(1) | BIT(0));

		db[2] & (BIT(1) | BIT(0));

	connector->rgb_qs =

		db[2] & BIT(6);

	connector->yuv_qs =

		db[2] & BIT(7);





	DRM_DEBUG_KMS("Scan Info (pt|it|ce): (%d|%d|%d)",

	DRM_DEBUG_KMS("Scan Info (pt|it|ce): (%d|%d|%d)",

			  (int) connector->pt_scan_info,

			  (int) connector->pt_scan_info,

			  (int) connector->it_scan_info,

			  (int) connector->it_scan_info,

			  (int) connector->ce_scan_info);

			  (int) connector->ce_scan_info);

	DRM_DEBUG_KMS("rgb_quant_range_select %d", connector->rgb_qs);

	DRM_DEBUG_KMS("ycc_quant_range_select %d", connector->yuv_qs);

}

}





static bool drm_edid_is_luminance_value_present(

static bool drm_edid_is_luminance_value_present(

include/drm/drm_crtc.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -658,6 +658,8 @@ struct drm_encoder { 
 * @hdr_avg_luminance: desired avg luminance obtained from HDR block

 * @hdr_avg_luminance: desired avg luminance obtained from HDR block

 * @hdr_min_luminance: desired min luminance obtained from HDR block

 * @hdr_min_luminance: desired min luminance obtained from HDR block

 * @hdr_supported: does the sink support HDR content

 * @hdr_supported: does the sink support HDR content

 * @rgb_qs: does the sink declare RGB selectable quantization range

 * @yuv_qs: does the sink declare YCC selectable quantization range

 * @edid_corrupt: indicates whether the last read EDID was corrupt

 * @edid_corrupt: indicates whether the last read EDID was corrupt

 * @debugfs_entry: debugfs directory for this connector

 * @debugfs_entry: debugfs directory for this connector

 * @state: current atomic state for this connector

 * @state: current atomic state for this connector
@@ -746,6 +748,8 @@ struct drm_connector { 
	u32 hdr_avg_luminance;

	u32 hdr_avg_luminance;

	u32 hdr_min_luminance;

	u32 hdr_min_luminance;

	bool hdr_supported;

	bool hdr_supported;

	bool rgb_qs;

	bool yuv_qs;

	/* Flag for raw EDID header corruption - used in Displayport

	/* Flag for raw EDID header corruption - used in Displayport

	 * compliance testing - * Displayport Link CTS Core 1.2 rev1.1 4.2.2.6

	 * compliance testing - * Displayport Link CTS Core 1.2 rev1.1 4.2.2.6

	 */

	 */