> Cleanup some leftovers from the X port.  Dave you may want to just let
> Eric take this since the next patch depends on this one.

Please don't send patches that will break the build, if this needs a 
change in the i915 driver include it in this patch and I'll take care of 
it. if I apply this now i915 won't build unless I fix it up.

Dave.

 > 
> Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
> ---
>  drivers/gpu/drm/drm_crtc_helper.c |    3 +--
>  include/drm/drm_crtc_helper.h     |    2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_crtc_helper.c 
> b/drivers/gpu/drm/drm_crtc_helper.c
> index 1c3a8c5..e59746a 100644
> --- a/drivers/gpu/drm/drm_crtc_helper.c
> +++ b/drivers/gpu/drm/drm_crtc_helper.c
> @@ -885,7 +885,6 @@ bool drm_helper_plugged_event(struct drm_device *dev)
>  /**
>   * drm_initial_config - setup a sane initial connector configuration
>   * @dev: DRM device
> - * @can_grow: this configuration is growable
>   *
>   * LOCKING:
>   * Called at init time, must take mode config lock.
> @@ -897,7 +896,7 @@ bool drm_helper_plugged_event(struct drm_device *dev)
>   * RETURNS:
>   * Zero if everything went ok, nonzero otherwise.
>   */
> -bool drm_helper_initial_config(struct drm_device *dev, bool can_grow)
> +bool drm_helper_initial_config(struct drm_device *dev)
>  {
>       struct drm_connector *connector;
>       int count = 0;
> diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
> index c7d4b2e..b672184 100644
> --- a/include/drm/drm_crtc_helper.h
> +++ b/include/drm/drm_crtc_helper.h
> @@ -92,7 +92,7 @@ struct drm_connector_helper_funcs {
>  extern int drm_helper_probe_single_connector_modes(struct drm_connector 
> *connector, uint32_t maxX, uint32_t maxY);
>  extern void drm_helper_disable_unused_functions(struct drm_device *dev);
>  extern int drm_helper_hotplug_stage_two(struct drm_device *dev);
> -extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow);
> +extern bool drm_helper_initial_config(struct drm_device *dev);
>  extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
>  extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
>                                    struct drm_display_mode *mode,
> 

------------------------------------------------------------------------------
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to