hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 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>
This commit is contained in:
Ville Syrjälä 2015-09-07 18:22:57 +03:00 committed by Daniel Vetter
parent 85f8fcd619
commit 9e5a3b529e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_edid.c
View File

@ -3396,7 +3396,6 @@ EXPORT_SYMBOL(drm_av_sync_delay);
/** /**
* drm_select_eld - select one ELD from multiple HDMI/DP sinks * drm_select_eld - select one ELD from multiple HDMI/DP sinks
* @encoder: the encoder just changed display mode * @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. * 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. * 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 * Return: The connector associated with the first HDMI/DP sink that has ELD
* attached to it. * attached to it.
*/ */
struct drm_connector *drm_select_eld(struct drm_encoder *encoder, struct drm_connector *drm_select_eld(struct drm_encoder *encoder)
struct drm_display_mode *mode)
{ {
struct drm_connector *connector; struct drm_connector *connector;
struct drm_device *dev = encoder->dev; struct drm_device *dev = encoder->dev;

2
drivers/gpu/drm/i915/intel_audio.c
View File

@ -401,7 +401,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
struct drm_device *dev = encoder->dev; struct drm_device *dev = encoder->dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
connector = drm_select_eld(encoder, mode); connector = drm_select_eld(encoder);
if (!connector) if (!connector)
return; return;

3
include/drm/drm_edid.h
View 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_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
int drm_av_sync_delay(struct drm_connector *connector, int drm_av_sync_delay(struct drm_connector *connector,
struct drm_display_mode *mode); struct drm_display_mode *mode);
struct drm_connector *drm_select_eld(struct drm_encoder *encoder, struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
struct drm_display_mode *mode);
int drm_load_edid_firmware(struct drm_connector *connector); int drm_load_edid_firmware(struct drm_connector *connector);
int int