On Thu, Jul 18, 2013 at 02:15:59PM +0200, Daniel Vetter wrote: > On Tue, Jul 16, 2013 at 08:02:11PM +0100, Chris Wilson wrote: > > Currently, the register access code is split between i915_drv.c and > > intel_pm.c. It only bares a superficial resemblance to the reset of the > > powermanagement code, so move it all into its own file. This is to ease > > further patches to enforce serialised register access. > > > > v2: Scan for random abuse of I915_WRITE_NOTRACE > > v3: Take the opportunity to rename the GT functions as uncore. Uncore is > > the term used by the hardware design (and bspec) for all functions > > outside of the GPU (and CPU) cores in what is also known as the System > > Agent. > > > > Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> > > Reviewed-by: Ben Widawsky <b...@bwidawsk.net> > > I've tried to apply it, but this patch does way to many things at once. So > the oddball change we have compared to the baseline of these patches > resulted in conflict hell.
The conflict is trivial. -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx