Commit 9e5a3b52 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Remove the 'mode' argument from drm_select_eld() 



drm_select_eld() doesn't look at the passed in mode, so don't pass it
in.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 85f8fcd6

drivers/gpu/drm/drm_edid.c

+1 −3
Original line number Diff line number Diff line
@@ -3396,7 +3396,6 @@ EXPORT_SYMBOL(drm_av_sync_delay); 
/**

 * drm_select_eld - select one ELD from multiple HDMI/DP sinks

 * @encoder: the encoder just changed display mode

 * @mode: the adjusted display mode

 *

 * It's possible for one encoder to be associated with multiple HDMI/DP sinks.

 * The policy is now hard coded to simply use the first HDMI/DP sink's ELD.
@@ -3404,8 +3403,7 @@ EXPORT_SYMBOL(drm_av_sync_delay); 
 * Return: The connector associated with the first HDMI/DP sink that has ELD

 * attached to it.

 */

struct drm_connector *drm_select_eld(struct drm_encoder *encoder,

				     struct drm_display_mode *mode)

struct drm_connector *drm_select_eld(struct drm_encoder *encoder)

{

	struct drm_connector *connector;

	struct drm_device *dev = encoder->dev;

drivers/gpu/drm/i915/intel_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	connector = drm_select_eld(encoder, mode);

	connector = drm_select_eld(encoder);

	if (!connector)

		return;

include/drm/drm_edid.h

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads); 
int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);

int drm_av_sync_delay(struct drm_connector *connector,

		      struct drm_display_mode *mode);

struct drm_connector *drm_select_eld(struct drm_encoder *encoder,

				     struct drm_display_mode *mode);

struct drm_connector *drm_select_eld(struct drm_encoder *encoder);

int drm_load_edid_firmware(struct drm_connector *connector);



int

CRA Git | Maintained and supported by SUSTech CRA and CCSE