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

Commit 382d2af6 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/edid: Clean up DRM_EDID_DIGITAL_* flags 



Give the "DFP 1.x" bit a proper name, and clean up the rest
of the bits defines as well.

Cc: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190529110204.2384-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
parent f2f2bb60

drivers/gpu/drm/drm_edid.c

+1 −1
Original line number Diff line number Diff line
@@ -4570,7 +4570,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi 
	 * extensions which tell otherwise.

	 */

	if ((info->bpc == 0) && (edid->revision < 4) &&

	    (edid->input & DRM_EDID_DIGITAL_TYPE_DVI)) {

	    (edid->input & DRM_EDID_DIGITAL_DFP_1_X)) {

		info->bpc = 8;

		DRM_DEBUG("%s: Assigning DFP sink color depth as %d bpc.\n",

			  connector->name, info->bpc);

include/drm/drm_edid.h

+17 −15
Original line number Diff line number Diff line
@@ -177,21 +177,23 @@ struct detailed_timing { 
#define DRM_EDID_INPUT_BLANK_TO_BLACK  (1 << 4)

#define DRM_EDID_INPUT_VIDEO_LEVEL     (3 << 5)

#define DRM_EDID_INPUT_DIGITAL         (1 << 7)

#define DRM_EDID_DIGITAL_DEPTH_MASK    (7 << 4)

#define DRM_EDID_DIGITAL_DEPTH_UNDEF   (0 << 4)

#define DRM_EDID_DIGITAL_DEPTH_6       (1 << 4)

#define DRM_EDID_DIGITAL_DEPTH_8       (2 << 4)

#define DRM_EDID_DIGITAL_DEPTH_10      (3 << 4)

#define DRM_EDID_DIGITAL_DEPTH_12      (4 << 4)

#define DRM_EDID_DIGITAL_DEPTH_14      (5 << 4)

#define DRM_EDID_DIGITAL_DEPTH_16      (6 << 4)

#define DRM_EDID_DIGITAL_DEPTH_RSVD    (7 << 4)

#define DRM_EDID_DIGITAL_TYPE_UNDEF    (0)

#define DRM_EDID_DIGITAL_TYPE_DVI      (1)

#define DRM_EDID_DIGITAL_TYPE_HDMI_A   (2)

#define DRM_EDID_DIGITAL_TYPE_HDMI_B   (3)

#define DRM_EDID_DIGITAL_TYPE_MDDI     (4)

#define DRM_EDID_DIGITAL_TYPE_DP       (5)

#define DRM_EDID_DIGITAL_DEPTH_MASK    (7 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_UNDEF   (0 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_6       (1 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_8       (2 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_10      (3 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_12      (4 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_14      (5 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_16      (6 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_DEPTH_RSVD    (7 << 4) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_MASK     (7 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_UNDEF    (0 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_DVI      (1 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_HDMI_A   (2 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_HDMI_B   (3 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_MDDI     (4 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_TYPE_DP       (5 << 0) /* 1.4 */

#define DRM_EDID_DIGITAL_DFP_1_X       (1 << 0) /* 1.3 */



#define DRM_EDID_FEATURE_DEFAULT_GTF      (1 << 0)

#define DRM_EDID_FEATURE_PREFERRED_TIMING (1 << 1)