On Thu, 04 Feb 2021, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > On Thu, Feb 04, 2021 at 09:43:20PM +0200, Jani Nikula wrote: >> -unsigned int >> -intel_plane_fence_y_offset(const struct intel_plane_state *plane_state) >> -{ >> - int x = 0, y = 0; >> - >> - intel_plane_adjust_aligned_offset(&x, &y, plane_state, 0, >> - plane_state->color_plane[0].offset, 0); >> - >> - return y; >> -} > > This unrelated code motion is still here, messing up the diff. Right. I wasn't looking to improve anything, I just wanted to rebase and get test results. BR, Jani. > > <snip> >> } >> >> -void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state) >> -{ >> - struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); >> - int i; >> - >> - for (i = 0; i < crtc->num_scalers; i++) >> - skl_detach_scaler(crtc, i); >> -} > > ditto -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx