From: Ville Syrjälä Date: Wed, 28 Sep 2016 13:51:38 +0000 (+0300) Subject: UPSTREAM: drm/edid: Don't pass around drm_display_info needlessly X-Git-Tag: release-20171130_firefly~4^2~358 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a94d0e3ed9f2f9f940de04debe8028ec728c05e5;p=firefly-linux-kernel-4.4.55.git UPSTREAM: drm/edid: Don't pass around drm_display_info needlessly We already pass the connector to drm_add_display_info() and drm_assign_hdmi_deep_color_info(), so passing the connector->display_info also is pointless. Change-Id: I6c2035b7d9dd942adeb4e3477ef8999aca4a74a4 Signed-off-by: Ville Syrjälä Acked-by: Christian König Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1475070703-6435-6-git-send-email-ville.syrjala@linux.intel.com Signed-off-by: Zheng Yang (cherry picked from commit 1826750f5775fa17909d02755bc872dfcfc6685e) --- diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index d53a59423f9f..f8dac4d74712 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4092,9 +4092,9 @@ EXPORT_SYMBOL(drm_rgb_quant_range_selectable); * Return true if HDMI deep color supported, false if not or unknown. */ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, - struct drm_display_info *info, struct drm_connector *connector) { + struct drm_display_info *info = &connector->display_info; u8 *edid_ext, *hdmi; int i; int start_offset, end_offset; @@ -4192,9 +4192,9 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, * color spaces. */ static void drm_add_display_info(struct edid *edid, - struct drm_display_info *info, struct drm_connector *connector) { + struct drm_display_info *info = &connector->display_info; u8 *edid_ext; info->width_mm = edid->width_cm * 10; @@ -4224,7 +4224,7 @@ static void drm_add_display_info(struct edid *edid, } /* HDMI deep color modes supported? Assign to info, if so */ - drm_assign_hdmi_deep_color_info(edid, info, connector); + drm_assign_hdmi_deep_color_info(edid, connector); /* * Digital sink with "DFP 1.x compliant TMDS" according to EDID 1.3? @@ -4458,7 +4458,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) edid_fixup_preferred(connector, quirks); - drm_add_display_info(edid, &connector->display_info, connector); + drm_add_display_info(edid, connector); if (quirks & EDID_QUIRK_FORCE_6BPC) connector->display_info.bpc = 6;