[PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs

[Daniel Vetter]

On Thu, Nov 28, 2013 at 03:29:18PM +0000, Damien Lespiau wrote:
> We had some mode_valid() vfuncs returning an int, others the enum. Let's
> use the latter everywhere.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>

Yeah, makes sense. Queued for -next, thanks for the patch.
-Daniel
> ---
>  drivers/gpu/drm/i915/intel_crt.c  | 5 +++--
>  drivers/gpu/drm/i915/intel_dp.c   | 2 +-
>  drivers/gpu/drm/i915/intel_dsi.c  | 5 +++--
>  drivers/gpu/drm/i915/intel_dvo.c  | 5 +++--
>  drivers/gpu/drm/i915/intel_hdmi.c | 5 +++--
>  drivers/gpu/drm/i915/intel_lvds.c | 5 +++--
>  drivers/gpu/drm/i915/intel_sdvo.c | 5 +++--
>  7 files changed, 19 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index b5b1b9b..e2e39e6 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -222,8 +222,9 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
>  	intel_modeset_check_state(connector->dev);
>  }
>  
> -static int intel_crt_mode_valid(struct drm_connector *connector,
> -				struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_crt_mode_valid(struct drm_connector *connector,
> +		     struct drm_display_mode *mode)
>  {
>  	struct drm_device *dev = connector->dev;
>  
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index c36a227..7c54f62 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -142,7 +142,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)
>  	return (max_link_clock * max_lanes * 8) / 10;
>  }
>  
> -static int
> +static enum drm_mode_status
>  intel_dp_mode_valid(struct drm_connector *connector,
>  		    struct drm_display_mode *mode)
>  {
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index d257b09..7b9b350 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -251,8 +251,9 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
>  	/* XXX: read flags, set to adjusted_mode */
>  }
>  
> -static int intel_dsi_mode_valid(struct drm_connector *connector,
> -				struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_dsi_mode_valid(struct drm_connector *connector,
> +		     struct drm_display_mode *mode)
>  {
>  	struct intel_connector *intel_connector = to_intel_connector(connector);
>  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 3c77365..eeff998 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -234,8 +234,9 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)
>  	intel_modeset_check_state(connector->dev);
>  }
>  
> -static int intel_dvo_mode_valid(struct drm_connector *connector,
> -				struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_dvo_mode_valid(struct drm_connector *connector,
> +		     struct drm_display_mode *mode)
>  {
>  	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
>  
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index d0c81b1..6a6ad0c 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -853,8 +853,9 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
>  		return 225000;
>  }
>  
> -static int intel_hdmi_mode_valid(struct drm_connector *connector,
> -				 struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_hdmi_mode_valid(struct drm_connector *connector,
> +		      struct drm_display_mode *mode)
>  {
>  	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
>  		return MODE_CLOCK_HIGH;
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index c3b4da7..3deb58e 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -256,8 +256,9 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
>  	POSTING_READ(lvds_encoder->reg);
>  }
>  
> -static int intel_lvds_mode_valid(struct drm_connector *connector,
> -				 struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_lvds_mode_valid(struct drm_connector *connector,
> +		      struct drm_display_mode *mode)
>  {
>  	struct intel_connector *intel_connector = to_intel_connector(connector);
>  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index e4f9918..2abeab0 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1536,8 +1536,9 @@ static void intel_sdvo_dpms(struct drm_connector *connector, int mode)
>  	intel_modeset_check_state(connector->dev);
>  }
>  
> -static int intel_sdvo_mode_valid(struct drm_connector *connector,
> -				 struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_sdvo_mode_valid(struct drm_connector *connector,
> +		      struct drm_display_mode *mode)
>  {
>  	struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
>  
> -- 
> 1.8.3.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch