diff options
author | Clint Taylor <clinton.a.taylor@intel.com> | 2018-10-05 17:52:15 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-10-16 09:38:16 -0400 |
commit | 9068e02f58740778d8270840657f1e250a2cc60f (patch) | |
tree | b9c12dc545d07049335d35d3324bc3816bb7c2c3 | |
parent | 064253c1c0625efd0362a0b7ecdbe8bee2a2904d (diff) |
drm/edid: VSDB yCBCr420 Deep Color mode bit definitions
HDMI Forum VSDB YCBCR420 deep color capability bits are 2:0. Correct
definitions in the header for the mask to work correctly.
Fixes: e6a9a2c3dc43 ("drm/edid: parse ycbcr 420 deep color information")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107893
Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1538776335-12569-1-git-send-email-clinton.a.taylor@intel.com
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 2 | ||||
-rw-r--r-- | include/drm/drm_edid.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 1e2b9407c8d0..ff0bfc65a8c1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -4282,7 +4282,7 @@ static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector, | |||
4282 | struct drm_hdmi_info *hdmi = &connector->display_info.hdmi; | 4282 | struct drm_hdmi_info *hdmi = &connector->display_info.hdmi; |
4283 | 4283 | ||
4284 | dc_mask = db[7] & DRM_EDID_YCBCR420_DC_MASK; | 4284 | dc_mask = db[7] & DRM_EDID_YCBCR420_DC_MASK; |
4285 | hdmi->y420_dc_modes |= dc_mask; | 4285 | hdmi->y420_dc_modes = dc_mask; |
4286 | } | 4286 | } |
4287 | 4287 | ||
4288 | static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, | 4288 | static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, |
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index b25d12ef120a..e3c404833115 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h | |||
@@ -214,9 +214,9 @@ struct detailed_timing { | |||
214 | #define DRM_EDID_HDMI_DC_Y444 (1 << 3) | 214 | #define DRM_EDID_HDMI_DC_Y444 (1 << 3) |
215 | 215 | ||
216 | /* YCBCR 420 deep color modes */ | 216 | /* YCBCR 420 deep color modes */ |
217 | #define DRM_EDID_YCBCR420_DC_48 (1 << 6) | 217 | #define DRM_EDID_YCBCR420_DC_48 (1 << 2) |
218 | #define DRM_EDID_YCBCR420_DC_36 (1 << 5) | 218 | #define DRM_EDID_YCBCR420_DC_36 (1 << 1) |
219 | #define DRM_EDID_YCBCR420_DC_30 (1 << 4) | 219 | #define DRM_EDID_YCBCR420_DC_30 (1 << 0) |
220 | #define DRM_EDID_YCBCR420_DC_MASK (DRM_EDID_YCBCR420_DC_48 | \ | 220 | #define DRM_EDID_YCBCR420_DC_MASK (DRM_EDID_YCBCR420_DC_48 | \ |
221 | DRM_EDID_YCBCR420_DC_36 | \ | 221 | DRM_EDID_YCBCR420_DC_36 | \ |
222 | DRM_EDID_YCBCR420_DC_30) | 222 | DRM_EDID_YCBCR420_DC_30) |