diff options
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 81b9ef82af73..caa84a056779 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -3738,9 +3738,9 @@ EXPORT_SYMBOL(drm_rgb_quant_range_selectable); | |||
3738 | * Return true if HDMI deep color supported, false if not or unknown. | 3738 | * Return true if HDMI deep color supported, false if not or unknown. |
3739 | */ | 3739 | */ |
3740 | static bool drm_assign_hdmi_deep_color_info(struct edid *edid, | 3740 | static bool drm_assign_hdmi_deep_color_info(struct edid *edid, |
3741 | struct drm_display_info *info, | ||
3742 | struct drm_connector *connector) | 3741 | struct drm_connector *connector) |
3743 | { | 3742 | { |
3743 | struct drm_display_info *info = &connector->display_info; | ||
3744 | u8 *edid_ext, *hdmi; | 3744 | u8 *edid_ext, *hdmi; |
3745 | int i; | 3745 | int i; |
3746 | int start_offset, end_offset; | 3746 | int start_offset, end_offset; |
@@ -3828,9 +3828,9 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, | |||
3828 | } | 3828 | } |
3829 | 3829 | ||
3830 | static void drm_add_display_info(struct edid *edid, | 3830 | static void drm_add_display_info(struct edid *edid, |
3831 | struct drm_display_info *info, | ||
3832 | struct drm_connector *connector) | 3831 | struct drm_connector *connector) |
3833 | { | 3832 | { |
3833 | struct drm_display_info *info = &connector->display_info; | ||
3834 | u8 *edid_ext; | 3834 | u8 *edid_ext; |
3835 | 3835 | ||
3836 | info->width_mm = edid->width_cm * 10; | 3836 | info->width_mm = edid->width_cm * 10; |
@@ -3860,7 +3860,7 @@ static void drm_add_display_info(struct edid *edid, | |||
3860 | } | 3860 | } |
3861 | 3861 | ||
3862 | /* HDMI deep color modes supported? Assign to info, if so */ | 3862 | /* HDMI deep color modes supported? Assign to info, if so */ |
3863 | drm_assign_hdmi_deep_color_info(edid, info, connector); | 3863 | drm_assign_hdmi_deep_color_info(edid, connector); |
3864 | 3864 | ||
3865 | /* | 3865 | /* |
3866 | * Digital sink with "DFP 1.x compliant TMDS" according to EDID 1.3? | 3866 | * Digital sink with "DFP 1.x compliant TMDS" according to EDID 1.3? |
@@ -4096,7 +4096,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) | |||
4096 | if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) | 4096 | if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) |
4097 | edid_fixup_preferred(connector, quirks); | 4097 | edid_fixup_preferred(connector, quirks); |
4098 | 4098 | ||
4099 | drm_add_display_info(edid, &connector->display_info, connector); | 4099 | drm_add_display_info(edid, connector); |
4100 | 4100 | ||
4101 | if (quirks & EDID_QUIRK_FORCE_6BPC) | 4101 | if (quirks & EDID_QUIRK_FORCE_6BPC) |
4102 | connector->display_info.bpc = 6; | 4102 | connector->display_info.bpc = 6; |