diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-05-11 15:44:40 -0400 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-05-13 14:27:49 -0400 |
commit | e1ff5f0126cd83b149060171a84a4b33972ea28b (patch) | |
tree | 1a457c6188adef2b41c4999b094df7b578accb8c | |
parent | 5b483747a92570176259bb896dcf2468291f3e42 (diff) |
drm/i915: Drop checks for max_pixclk failures in cdclk computation
commit 565602d7501a ("drm/i915: Do not acquire crtc state to check clock during modeset, v4.")
removed the possibility that intel_mode_max_pixclk() or
ilk_max_pixel_rate() might return an error, so let's get rid of the
error checks in the callers as well.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-2-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 76865122063c..5bc7300db654 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -5953,9 +5953,6 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state) | |||
5953 | struct intel_atomic_state *intel_state = | 5953 | struct intel_atomic_state *intel_state = |
5954 | to_intel_atomic_state(state); | 5954 | to_intel_atomic_state(state); |
5955 | 5955 | ||
5956 | if (max_pixclk < 0) | ||
5957 | return max_pixclk; | ||
5958 | |||
5959 | intel_state->cdclk = intel_state->dev_cdclk = | 5956 | intel_state->cdclk = intel_state->dev_cdclk = |
5960 | valleyview_calc_cdclk(dev_priv, max_pixclk); | 5957 | valleyview_calc_cdclk(dev_priv, max_pixclk); |
5961 | 5958 | ||
@@ -5973,9 +5970,6 @@ static int broxton_modeset_calc_cdclk(struct drm_atomic_state *state) | |||
5973 | struct intel_atomic_state *intel_state = | 5970 | struct intel_atomic_state *intel_state = |
5974 | to_intel_atomic_state(state); | 5971 | to_intel_atomic_state(state); |
5975 | 5972 | ||
5976 | if (max_pixclk < 0) | ||
5977 | return max_pixclk; | ||
5978 | |||
5979 | intel_state->cdclk = intel_state->dev_cdclk = | 5973 | intel_state->cdclk = intel_state->dev_cdclk = |
5980 | broxton_calc_cdclk(dev_priv, max_pixclk); | 5974 | broxton_calc_cdclk(dev_priv, max_pixclk); |
5981 | 5975 | ||