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

Commit 18316c8c authored by Thierry Reding's avatar Thierry Reding
Browse files

drm: Remove duplicate drm_mode_cea_vic() 



The same function had already been merged with a different name. Remove
the duplicate one but reuse some of its kerneldoc fragments for the
existing implementation.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c976cb37

drivers/gpu/drm/drm_edid.c

+7 −23
Original line number Diff line number Diff line
@@ -1516,11 +1516,14 @@ u8 *drm_find_cea_extension(struct edid *edid) 
}

EXPORT_SYMBOL(drm_find_cea_extension);



/*

 * Looks for a CEA mode matching given drm_display_mode.

 * Returns its CEA Video ID code, or 0 if not found.

/**

 * drm_match_cea_mode - look for a CEA mode matching given mode

 * @to_match: display mode

 *

 * Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861

 * mode.

 */

u8 drm_match_cea_mode(struct drm_display_mode *to_match)

u8 drm_match_cea_mode(const struct drm_display_mode *to_match)

{

	struct drm_display_mode *cea_mode;

	u8 mode;
@@ -2114,22 +2117,3 @@ int drm_add_modes_noedid(struct drm_connector *connector, 
	return num_modes;

}

EXPORT_SYMBOL(drm_add_modes_noedid);
 


/**

 * drm_mode_cea_vic - return the CEA-861 VIC of a given mode

 * @mode: mode

 *

 * RETURNS:

 * The VIC number, 0 in case it's not a CEA-861 mode.

 */

uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode)

{

	uint8_t i;



	for (i = 0; i < drm_num_cea_modes; i++)

		if (drm_mode_equal(mode, &edid_cea_modes[i]))

			return i + 1;



	return 0;

}

EXPORT_SYMBOL(drm_mode_cea_vic);

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, 
		 * CEA-861-E - 5.1 Default Encoding Parameters

		 * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry

		 */

		if (bpp != 18 && drm_mode_cea_vic(adjusted_mode) > 1)

		if (bpp != 18 && drm_match_cea_mode(adjusted_mode) > 1)

			intel_dp->color_range = DP_COLOR_RANGE_16_235;

		else

			intel_dp->color_range = 0;

drivers/gpu/drm/i915/intel_hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, 
			avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL;

	}



	avi_if.body.avi.VIC = drm_mode_cea_vic(adjusted_mode);

	avi_if.body.avi.VIC = drm_match_cea_mode(adjusted_mode);



	intel_set_infoframe(encoder, &avi_if);

}
@@ -781,7 +781,7 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, 
	if (intel_hdmi->color_range_auto) {

		/* See CEA-861-E - 5.1 Default Encoding Parameters */

		if (intel_hdmi->has_hdmi_sink &&

		    drm_mode_cea_vic(adjusted_mode) > 1)

		    drm_match_cea_mode(adjusted_mode) > 1)

			intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235;

		else

			intel_hdmi->color_range = 0;

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder, 
	if (intel_sdvo->color_range_auto) {

		/* See CEA-861-E - 5.1 Default Encoding Parameters */

		if (intel_sdvo->has_hdmi_monitor &&

		    drm_mode_cea_vic(adjusted_mode) > 1)

		    drm_match_cea_mode(adjusted_mode) > 1)

			intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;

		else

			intel_sdvo->color_range = 0;

include/drm/drm_crtc.h

+1 −2
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev, 
extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,

				    void *data, struct drm_file *file_priv);

extern u8 *drm_find_cea_extension(struct edid *edid);

extern u8 drm_match_cea_mode(struct drm_display_mode *to_match);

extern u8 drm_match_cea_mode(const struct drm_display_mode *to_match);

extern bool drm_detect_hdmi_monitor(struct edid *edid);

extern bool drm_detect_monitor_audio(struct edid *edid);

extern bool drm_rgb_quant_range_selectable(struct edid *edid);
@@ -1079,7 +1079,6 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, 
				int GTF_2C, int GTF_K, int GTF_2J);

extern int drm_add_modes_noedid(struct drm_connector *connector,

				int hdisplay, int vdisplay);

extern uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode);



extern int drm_edid_header_is_valid(const u8 *raw_edid);

extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid);