From: Daniel Vetter Subject: Re: [PATCH 02/24] drm/i915: Add some more tracked state to intel_pipe_wm Date: Tue, 29 Apr 2014 13:20:44 +0200 Message-ID: <20140429112044.GQ32404@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> <20140429111850.GP32404@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by gabe.freedesktop.org (Postfix) with ESMTP id E19FA6E9B0 for ; Tue, 29 Apr 2014 04:20:48 -0700 (PDT) Received: by mail-ee0-f53.google.com with SMTP id b57so201975eek.26 for ; Tue, 29 Apr 2014 04:20:48 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140429111850.GP32404@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org 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 : > > > From: Ville Syrj=E4l=E4 > > > > > > 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 hardware > > > state at the time we do the watermark merging for multiple pipes. > > > > > > Signed-off-by: Ville Syrj=E4l=E4 > > = > > 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 ... -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch