On Tue, Oct 20, 2015 at 05:17:07PM +0100, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > > Cdclk < crtc_clock is not allowed and suggests a different problem > elsewhere in the code. > > It is more robust and safe to assume no scaling is possible in > this case with no other downsides since it will also WARN_ON_ONCE > so that this definitely gets noticed. > > Call it an assert to help new platform bring-up in simulation. > > v2: Better commit msg and use WARN_ON_ONCE to signify the unexpectedness. > > v3: Move zero crtc_clock check under the warn. (Ville) > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 2981d09d5e4e..607a720c19ba 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13436,7 +13436,7 @@ skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state > crtc_clock = crtc_state->base.adjusted_mode.crtc_clock; > cdclk = to_intel_atomic_state(crtc_state->base.state)->cdclk; > > - if (!crtc_clock || !cdclk) > + if (WARN_ON_ONCE(!crtc_clock || cdclk < crtc_clock)) > return DRM_PLANE_HELPER_NO_SCALING; > > /* > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
