On Wed, 11 May 2016, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > 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@xxxxxxxxxxxxxxx> > Cc: Mika Kahola <mika.kahola@xxxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index b60d9b67e033..775ab3cf1eee 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5957,9 +5957,6 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state) > struct intel_atomic_state *intel_state = > to_intel_atomic_state(state); > > - if (max_pixclk < 0) > - return max_pixclk; > - > intel_state->cdclk = intel_state->dev_cdclk = > valleyview_calc_cdclk(dev_priv, max_pixclk); > > @@ -5977,9 +5974,6 @@ static int broxton_modeset_calc_cdclk(struct drm_atomic_state *state) > struct intel_atomic_state *intel_state = > to_intel_atomic_state(state); > > - if (max_pixclk < 0) > - return max_pixclk; > - > intel_state->cdclk = intel_state->dev_cdclk = > broxton_calc_cdclk(dev_priv, max_pixclk); -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx