On Fri, Jan 18, 2013 at 10:18:24PM +0100, Daniel Vetter wrote: > On Fri, Jan 18, 2013 at 12:30:34PM -0800, Ben Widawsky wrote: > > It is no longer used in the i915 code, so isolate it from the shared > > struct. > > > > This was originally part of: > > commit 0e275518f325418d559c05327775bff894b237f7 > > Author: Ben Widawsky <ben at bwidawsk.net> > > Date: Mon Jan 14 13:35:33 2013 -0800 > > > > agp/intel: decouple more of the agp-i915 sharing > > > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com> > > Signed-off-by: Ben Widawsky <ben at bwidawsk.net> > > > > That commit had some other hunks which can't be used due to issues > > Daniel found in previous commits. > > > > Recommend to squash this in to: > > commit 42389dbda7398dac0ceadef327d51dc5509f9399 > > Author: Ben Widawsky <ben at bwidawsk.net> > > Date: Fri Jan 11 13:50:28 2013 -0800 > > > > drm/i915: Remove use on gma_bus_addr on gen6+ > > > > Signed-off-by: Ben Widawsky <ben at bwidawsk.net> > > All slurped into dinq, thanks for the patches. > -Daniel It seems the accidentally dropped hunk you caught is indeed a problem on my machine. I've submitted a patch to revert it. Sorry. -- Ben Widawsky, Intel Open Source Technology Center