From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 06/24] drm/i915: Disable/enable planes as
 the first/last thing during modeset on ILK+
Date: Tue, 15 Apr 2014 23:23:21 +0200
Message-ID: <20140415212321.GD10722@phenom.ffwll.local>
References: <1394209951-9963-1-git-send-email-ville.syrjala@linux.intel.com>
 <1394209951-9963-7-git-send-email-ville.syrjala@linux.intel.com>
 <CA+gsUGSceqS5FLYnWE91q0ziH9XOVj_j6fdWy4CC_9JaAY=Qtg@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-f45.google.com (mail-ee0-f45.google.com [74.125.83.45])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2F65A6E2E8
 for <intel-gfx@lists.freedesktop.org>; Tue, 15 Apr 2014 14:23:26 -0700 (PDT)
Received: by mail-ee0-f45.google.com with SMTP id d17so8061771eek.18
 for <intel-gfx@lists.freedesktop.org>; Tue, 15 Apr 2014 14:23:25 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <CA+gsUGSceqS5FLYnWE91q0ziH9XOVj_j6fdWy4CC_9JaAY=Qtg@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 Mon, Apr 07, 2014 at 04:51:21PM -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>
> >
> > We already do this for HSW, but doing it makes sense for everything else
> > as well. Extend it for ILK/SNB/IVB since that's where the new watermark
> > code is used.
> >
> > Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> =

> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

I've frobbed the conflict and added the bz link for the vblank wait
warnings which this should fix. Queued for -next, thanks for the patch.
-Daniel
-- =

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