drm: Remove the 'mode' argument from drm_select_eld()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 7 Sep 2015 15:22:57 +0000 (18:22 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Sep 2015 12:53:48 +0000 (14:53 +0200)
drm_select_eld() doesn't look at the passed in mode, so don't pass it
in.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_audio.c
include/drm/drm_edid.h

index 9afb1fc15b34a0e057d17e2f9b2b19f7e872d836..e32218f035849dde171fa5b70cd05df456232110 100644 (file)
@@ -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;
index dc32cf4585f8a58db7ba256dd3599dcdeb7fba68..1314ebb282e4fe9cf9143bc1a337303a83f12e9c 100644 (file)
@@ -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;
 
index 53c53c459b15c8207997da61234d0ab9ea2805ae..31528d9573319bd0c13e492f2a896f0d92619a24 100644 (file)
@@ -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