diff mbox

[RESEND,3/6] drm/edid: Remove drm_select_eld

Message ID 1476885339-2265-4-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst Oct. 19, 2016, 1:55 p.m. UTC 
The only user was i915, which is now gone.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 26 --------------------------
 include/drm/drm_edid.h     |  1 -
 2 files changed, 27 deletions(-)

Comments

Ville Syrjälä Oct. 21, 2016, 2:05 p.m. UTC | #1 
On Wed, Oct 19, 2016 at 03:55:36PM +0200, Maarten Lankhorst wrote:
> The only user was i915, which is now gone.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

cc: dri-devel missing

> ---
>  drivers/gpu/drm/drm_edid.c | 26 --------------------------
>  include/drm/drm_edid.h     |  1 -
>  2 files changed, 27 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 95de47ba1e77..fc81e0eb6abf 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3578,32 +3578,6 @@ int drm_av_sync_delay(struct drm_connector *connector,
>  EXPORT_SYMBOL(drm_av_sync_delay);
>  
>  /**
> - * drm_select_eld - select one ELD from multiple HDMI/DP sinks
> - * @encoder: the encoder just changed 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.
> - *
> - * 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_connector *connector;
> -	struct drm_device *dev = encoder->dev;
> -
> -	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
> -	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
> -
> -	drm_for_each_connector(connector, dev)
> -		if (connector->encoder == encoder && connector->eld[0])
> -			return connector;
> -
> -	return NULL;
> -}
> -EXPORT_SYMBOL(drm_select_eld);
> -
> -/**
>   * drm_detect_hdmi_monitor - detect whether monitor is HDMI
>   * @edid: monitor EDID information
>   *
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index c3a7d440bc11..38eabf65f19d 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -330,7 +330,6 @@ 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,
>  		      const struct drm_display_mode *mode);
> -struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
>  
>  #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
>  int drm_load_edid_firmware(struct drm_connector *connector);
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä Oct. 21, 2016, 2:17 p.m. UTC | #2 
On Fri, Oct 21, 2016 at 05:05:16PM +0300, Ville Syrjälä wrote:
> On Wed, Oct 19, 2016 at 03:55:36PM +0200, Maarten Lankhorst wrote:
> > The only user was i915, which is now gone.
> > 
> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> 
> cc: dri-devel missing

Also
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> > ---
> >  drivers/gpu/drm/drm_edid.c | 26 --------------------------
> >  include/drm/drm_edid.h     |  1 -
> >  2 files changed, 27 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > index 95de47ba1e77..fc81e0eb6abf 100644
> > --- a/drivers/gpu/drm/drm_edid.c
> > +++ b/drivers/gpu/drm/drm_edid.c
> > @@ -3578,32 +3578,6 @@ int drm_av_sync_delay(struct drm_connector *connector,
> >  EXPORT_SYMBOL(drm_av_sync_delay);
> >  
> >  /**
> > - * drm_select_eld - select one ELD from multiple HDMI/DP sinks
> > - * @encoder: the encoder just changed 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.
> > - *
> > - * 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_connector *connector;
> > -	struct drm_device *dev = encoder->dev;
> > -
> > -	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
> > -	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
> > -
> > -	drm_for_each_connector(connector, dev)
> > -		if (connector->encoder == encoder && connector->eld[0])
> > -			return connector;
> > -
> > -	return NULL;
> > -}
> > -EXPORT_SYMBOL(drm_select_eld);
> > -
> > -/**
> >   * drm_detect_hdmi_monitor - detect whether monitor is HDMI
> >   * @edid: monitor EDID information
> >   *
> > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> > index c3a7d440bc11..38eabf65f19d 100644
> > --- a/include/drm/drm_edid.h
> > +++ b/include/drm/drm_edid.h
> > @@ -330,7 +330,6 @@ 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,
> >  		      const struct drm_display_mode *mode);
> > -struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
> >  
> >  #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
> >  int drm_load_edid_firmware(struct drm_connector *connector);
> > -- 
> > 2.7.4
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst Oct. 24, 2016, 8:44 a.m. UTC | #3 
Op 21-10-16 om 16:17 schreef Ville Syrjälä:
> On Fri, Oct 21, 2016 at 05:05:16PM +0300, Ville Syrjälä wrote:
>> On Wed, Oct 19, 2016 at 03:55:36PM +0200, Maarten Lankhorst wrote:
>>> The only user was i915, which is now gone.
>>>
>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> cc: dri-devel missing
> Also
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Indeed, I'll ask for a ack from a drm maintainer.
>>> ---
>>>  drivers/gpu/drm/drm_edid.c | 26 --------------------------
>>>  include/drm/drm_edid.h     |  1 -
>>>  2 files changed, 27 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>>> index 95de47ba1e77..fc81e0eb6abf 100644
>>> --- a/drivers/gpu/drm/drm_edid.c
>>> +++ b/drivers/gpu/drm/drm_edid.c
>>> @@ -3578,32 +3578,6 @@ int drm_av_sync_delay(struct drm_connector *connector,
>>>  EXPORT_SYMBOL(drm_av_sync_delay);
>>>  
>>>  /**
>>> - * drm_select_eld - select one ELD from multiple HDMI/DP sinks
>>> - * @encoder: the encoder just changed 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.
>>> - *
>>> - * 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_connector *connector;
>>> -	struct drm_device *dev = encoder->dev;
>>> -
>>> -	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
>>> -	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
>>> -
>>> -	drm_for_each_connector(connector, dev)
>>> -		if (connector->encoder == encoder && connector->eld[0])
>>> -			return connector;
>>> -
>>> -	return NULL;
>>> -}
>>> -EXPORT_SYMBOL(drm_select_eld);
>>> -
>>> -/**
>>>   * drm_detect_hdmi_monitor - detect whether monitor is HDMI
>>>   * @edid: monitor EDID information
>>>   *
>>> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
>>> index c3a7d440bc11..38eabf65f19d 100644
>>> --- a/include/drm/drm_edid.h
>>> +++ b/include/drm/drm_edid.h
>>> @@ -330,7 +330,6 @@ 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,
>>>  		      const struct drm_display_mode *mode);
>>> -struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
>>>  
>>>  #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
>>>  int drm_load_edid_firmware(struct drm_connector *connector);
>>> -- 
>>> 2.7.4
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> -- 
>> Ville Syrjälä
>> Intel OTC
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 95de47ba1e77..fc81e0eb6abf 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3578,32 +3578,6 @@  int drm_av_sync_delay(struct drm_connector *connector,
 EXPORT_SYMBOL(drm_av_sync_delay);
 
 /**
- * drm_select_eld - select one ELD from multiple HDMI/DP sinks
- * @encoder: the encoder just changed 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.
- *
- * 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_connector *connector;
-	struct drm_device *dev = encoder->dev;
-
-	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
-	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
-
-	drm_for_each_connector(connector, dev)
-		if (connector->encoder == encoder && connector->eld[0])
-			return connector;
-
-	return NULL;
-}
-EXPORT_SYMBOL(drm_select_eld);
-
-/**
  * drm_detect_hdmi_monitor - detect whether monitor is HDMI
  * @edid: monitor EDID information
  *
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index c3a7d440bc11..38eabf65f19d 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -330,7 +330,6 @@  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,
 		      const struct drm_display_mode *mode);
-struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
 
 #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
 int drm_load_edid_firmware(struct drm_connector *connector);