[Intel-gfx] [PATCH 1/3] drm/i915: Introduce i9xx_set_pipeconf()

[Daniel Vetter]

On Wed, Apr 03, 2013 at 07:06:01PM +0200, Daniel Vetter wrote:
> On Wed, Apr 03, 2013 at 01:08:16PM +0300, Jani Nikula wrote:
> > On Tue, 02 Apr 2013, ville.syrjala at linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > >
> > > Extract the PIPECONF setup into i9xx_set_pipeconf(). This makes the
> > > <=Gen4/VLV code follow the same pattern as the Gen5+ codepaths.
> > 
> > Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> 
> Queued for -next with a pretty massive bikeshed (extended conflict
> resolutions ftw), thanks for the patch.

I've changed my mind after trying to rebase my current pipe_config stuff
on top of latest dinq - I've noticed that I've written this exact patch,
but in slightly different colors:

https://patchwork.kernel.org/patch/2173951/

The slightly different colors resulted in rebase hell in my pipe_config
branch, so I've ditched your patch here and exchanged it with mine -
rebasing your two patches on top was much easier ;-)

Cheers, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch