From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 1/3] drm/i915: Introduce i9xx_set_pipeconf()
Date: Wed, 3 Apr 2013 23:15:54 +0200
Message-ID: <20130403211554.GR2228@phenom.ffwll.local>
References: <1364908210-13748-1-git-send-email-ville.syrjala@linux.intel.com>
	<1364908210-13748-2-git-send-email-ville.syrjala@linux.intel.com>
	<87hajoncz3.fsf@intel.com>
	<20130403170601.GO2228@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41])
	by gabe.freedesktop.org (Postfix) with ESMTP id 4D5ADE622D
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  3 Apr 2013 14:12:58 -0700 (PDT)
Received: by mail-ee0-f41.google.com with SMTP id c1so846412eek.0
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 03 Apr 2013 14:12:57 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <20130403170601.GO2228@phenom.ffwll.local>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

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@linux.intel.com wrote:
> > > From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> > >
> > > Extract the PIPECONF setup into i9xx_set_pipeconf(). This makes the
> > > <=3DGen4/VLV code follow the same pattern as the Gen5+ codepaths.
> > =

> > Reviewed-by: Jani Nikula <jani.nikula@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