On Thu, Dec 15, 2016 at 03:58:44PM +0100, Maarten Lankhorst wrote: > Op 12-12-16 om 21:35 schreef [email protected]: > > From: Ville Syrjälä <[email protected]> > > > > Track the plane fifo sizes under intel_crtc instead of under each > > intel_plane. Avoids looping over the planes in a bunch of places, > > and later we'll move this tracking into the crtc state properly. > > > > Signed-off-by: Ville Syrjälä <[email protected]> > > --- > > drivers/gpu/drm/i915/intel_drv.h | 7 ++- > > drivers/gpu/drm/i915/intel_pm.c | 115 > > ++++++++++++++++----------------------- > > 2 files changed, 54 insertions(+), 68 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > > b/drivers/gpu/drm/i915/intel_drv.h > > index 20ba8f48bc3b..69b6f45e3eed 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -683,6 +683,10 @@ struct vlv_wm_state { > > bool cxsr; > > }; > > > > +struct vlv_fifo_state { > > + uint16_t plane[I915_MAX_PLANES]; > > +}; > > + > > struct intel_crtc { > > struct drm_crtc base; > > enum pipe pipe; > > @@ -732,6 +736,8 @@ struct intel_crtc { > > > > /* allow CxSR on this pipe */ > > bool cxsr_allowed; > > + > > + struct vlv_fifo_state fifo_state; > > } wm; > > > > int scanline_offset; > > @@ -765,7 +771,6 @@ struct intel_plane_wm_parameters { > > bool scaled; > > u64 tiling; > > unsigned int rotation; > > - uint16_t fifo_size; > > }; > intel_plane_wm_parameters can be removed entirely, fifo_size was the only > member still being used there.
Done. -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
