From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 02/24] drm/i915: Add some more tracked state
 to intel_pipe_wm
Date: Tue, 29 Apr 2014 15:57:31 +0200
Message-ID: <20140429135731.GR32404@phenom.ffwll.local>
References: <1394209951-9963-1-git-send-email-ville.syrjala@linux.intel.com>
 <1394209951-9963-3-git-send-email-ville.syrjala@linux.intel.com>
 <CA+gsUGTgvaOCkeMZ3cHdb4TFnny-BjRSpKBEm4qZ7ZYqPPmi8g@mail.gmail.com>
 <20140429111850.GP32404@phenom.ffwll.local>
 <20140429112044.GQ32404@phenom.ffwll.local>
 <CA+gsUGT+k8sRj0nj965VzNKybk1tiZCestZWMiUXpmn-_HMwnA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52])
 by gabe.freedesktop.org (Postfix) with ESMTP id 8BB0A6EA23
 for <intel-gfx@lists.freedesktop.org>; Tue, 29 Apr 2014 06:57:37 -0700 (PDT)
Received: by mail-ee0-f52.google.com with SMTP id e53so344199eek.39
 for <intel-gfx@lists.freedesktop.org>; Tue, 29 Apr 2014 06:57:35 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <CA+gsUGT+k8sRj0nj965VzNKybk1tiZCestZWMiUXpmn-_HMwnA@mail.gmail.com>
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>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Paulo Zanoni <przanoni@gmail.com>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Tue, Apr 29, 2014 at 09:34:28AM -0300, Paulo Zanoni wrote:
> 2014-04-29 8:20 GMT-03:00 Daniel Vetter <daniel@ffwll.ch>:
> > On Tue, Apr 29, 2014 at 01:18:50PM +0200, Daniel Vetter wrote:
> >> On Mon, Apr 07, 2014 at 11:14:05AM -0300, Paulo Zanoni wrote:
> >> > 2014-03-07 13:32 GMT-03:00  <ville.syrjala@linux.intel.com>:
> >> > > From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> >> > >
> >> > > intel_pipe_wm will be used to track the state in different stages
> >> > > of the watermark update process. For that we need to keep a bit
> >> > > more state in intel_pipe_wm.
> >> > >
> >> > > We also need to separate the multi-pipe intel_wm_config computation
> >> > > from ilk_compute_wm_parameters() as that one deals with the future
> >> > > state, and we need the intel_wm_config to match the current hardwa=
re
> >> > > state at the time we do the watermark merging for multiple pipes.
> >> > >
> >> > > Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> >> >
> >> > Needs minor rebase, but looks correct.
> >>
> >> Ok in my eyes this conflict looks a bit tricky, and since I lack the
> >> insight of you two for the watermark code I'd prefer a rebased version.
> >
> > Or is this just because dinq is a bit out of sync with -nightly? In that
> > case I'm stalling on Dave to open up drm-next so that I can rebase the
> > entire shebang ...
> =

> I believe you have already applied patches 1-4 a few weeks ago. Maybe
> you're getting conflicts because you're applying already-applied
> patches? :)

Ah, that might indeed explain why the conflict looks so funny ;-)

/me puts on the idiot hat

Thanks, Daniel
-- =

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