aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-05-29 07:02:04 -0400
committerVille Syrjälä <ville.syrjala@linux.intel.com>2019-06-06 09:18:15 -0400
commit3bde449f0bf10e2660ad2858a0334f0eccf21a1c (patch)
treea507f18e21c685d6e92549e1b9408226f4ef19d7
parent382d2af64e7d7083eefcc8c7e6c780634174ce87 (diff)
drm/edid: Ignore "DFP 1.x" bit for EDID 1.2 and earlier
From VESA EDID implementation guide v1.0: "For EDID version 1 revision 2 or earlier data structures when offset 14h bit 7 is set to one, the value of bits 6-0 are undefined, and therefore cannot be interpreted to mean anything." And since EDID 1.4 redefines that bit let's consult it only for EDID 1.3. Cc: Mario Kleiner <mario.kleiner.de@gmail.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190529110204.2384-2-ville.syrjala@linux.intel.com Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
-rw-r--r--drivers/gpu/drm/drm_edid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dd601ed6a30e..c3296a72fff9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4569,8 +4569,8 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi
4569 * tells us to assume 8 bpc color depth if the EDID doesn't have 4569 * tells us to assume 8 bpc color depth if the EDID doesn't have
4570 * extensions which tell otherwise. 4570 * extensions which tell otherwise.
4571 */ 4571 */
4572 if ((info->bpc == 0) && (edid->revision < 4) && 4572 if (info->bpc == 0 && edid->revision == 3 &&
4573 (edid->input & DRM_EDID_DIGITAL_DFP_1_X)) { 4573 edid->input & DRM_EDID_DIGITAL_DFP_1_X) {
4574 info->bpc = 8; 4574 info->bpc = 8;
4575 DRM_DEBUG("%s: Assigning DFP sink color depth as %d bpc.\n", 4575 DRM_DEBUG("%s: Assigning DFP sink color depth as %d bpc.\n",
4576 connector->name, info->bpc); 4576 connector->name, info->bpc);