Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19de8eb authored Nov 28, 2013 by Damien Lespiau Committed by Daniel Vetter Nov 28, 2013

drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs



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@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent ddf9c536

drivers/gpu/drm/i915/intel_crt.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -222,7 +222,8 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
	intel_modeset_check_state(connector->dev);		intel_modeset_check_state(connector->dev);
	}		}

	static int intel_crt_mode_valid(struct drm_connector *connector,		static enum drm_mode_status
			intel_crt_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{
	struct drm_device *dev = connector->dev;		struct drm_device *dev = connector->dev;

drivers/gpu/drm/i915/intel_dp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)
	return (max_link_clock * max_lanes * 8) / 10;		return (max_link_clock * max_lanes * 8) / 10;
	}		}

	static int		static enum drm_mode_status
	intel_dp_mode_valid(struct drm_connector *connector,		intel_dp_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{

drivers/gpu/drm/i915/intel_dsi.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -251,7 +251,8 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
	/* XXX: read flags, set to adjusted_mode */		/* XXX: read flags, set to adjusted_mode */
	}		}

	static int intel_dsi_mode_valid(struct drm_connector *connector,		static enum drm_mode_status
			intel_dsi_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{
	struct intel_connector *intel_connector = to_intel_connector(connector);		struct intel_connector *intel_connector = to_intel_connector(connector);

drivers/gpu/drm/i915/intel_dvo.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,8 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)
	intel_modeset_check_state(connector->dev);		intel_modeset_check_state(connector->dev);
	}		}

	static int intel_dvo_mode_valid(struct drm_connector *connector,		static enum drm_mode_status
			intel_dvo_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);		struct intel_dvo *intel_dvo = intel_attached_dvo(connector);

drivers/gpu/drm/i915/intel_hdmi.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -853,7 +853,8 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
	return 225000;		return 225000;
	}		}

	static int intel_hdmi_mode_valid(struct drm_connector *connector,		static enum drm_mode_status
			intel_hdmi_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{
	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))		if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))