On Fri, Jan 25, 2013 at 05:00:42PM +0100, Daniel Vetter wrote: > On Fri, Jan 25, 2013 at 02:21:16PM +0200, Ville Syrj?l? wrote: > > On Thu, Jan 24, 2013 at 10:39:52PM +0100, Daniel Vetter wrote: > > > On Thu, Jan 24, 2013 at 03:29:34PM +0200, ville.syrjala at linux.intel.com wrote: > > > > From: Ville Syrj?l? <ville.syrjala at linux.intel.com> > > > > > > > > Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com> > > > > > > We already have a switch since VGACNTRL moved around on pch-split > > > platforms, too. To avoid confusion with different ways to select a given > > > reg I think a static inline and explicit VLV_VGACNTRL is better. Static > > > inline since with i915_redisable_vga and i915_disable_vga we already have > > > two callers. > > > > All right. The save/restore paths also touch VGACNTRL. I'll convert > > those too, even if we don't use them for much longer w/ kms. > > Actually I think it'd be easier to merge the few patches I'm working on > first. I'm testing them right now, will submit soon. OK. I wrote the patch already but I can wait a bit and rebase before sending it. -- Ville Syrj?l? Intel OTC