On Mon, Sep 22, 2014 at 03:21:22PM +0100, Damien Lespiau wrote: > On Mon, Sep 22, 2014 at 05:06:11PM +0300, Ville Syrjälä wrote: > > > +struct skl_pipe_wm { > > > + struct skl_wm_level wm[8]; > > > + struct skl_wm_level trans_wm; > > > + uint32_t linetime; > > > +}; > > > + > > > struct intel_crtc { > > > struct drm_crtc base; > > > enum pipe pipe; > > > @@ -431,9 +437,11 @@ struct intel_crtc { > > > bool pch_fifo_underrun_disabled; > > > > > > /* per-pipe watermark state */ > > > - struct { > > > + union { > > > > I almost gave my r-b, but then I noticed this. It's going to mess up my > > pending watermark series. I'm going to add tons of junk here, so union > > is not really acceptable for me. Needs some other solution. > > Well, you could use an anonymous structure in that union? We could also > try to merge skl_pipe_wm and intel_pipe_wm at a later point? or just > leaving this a struct, wasting a tiny bit of memory be good enough for > now? We only have 3 pipes ... you can waste a few kb and no one will notice at all ;-) -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx