From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paulo Zanoni <przanoni@gmail.com>
Subject: Re: [PATCH v2] drm/i915: Re-enable FBC WM if the
 watermark is good on gen6+
Date: Thu, 9 May 2013 17:51:13 -0300
Message-ID: <CA+gsUGQiLPG-EiE=V-vZzY+1ZhttgrgmMFfSfC0NaGPHjDpcAg@mail.gmail.com>
References: <1366826040-11621-1-git-send-email-ville.syrjala@linux.intel.com>
	<1366826950-11962-1-git-send-email-ville.syrjala@linux.intel.com>
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-ob0-f171.google.com (mail-ob0-f171.google.com
	[209.85.214.171])
	by gabe.freedesktop.org (Postfix) with ESMTP id D6975E5C97
	for <intel-gfx@lists.freedesktop.org>;
	Thu,  9 May 2013 13:51:13 -0700 (PDT)
Received: by mail-ob0-f171.google.com with SMTP id ef5so651231obb.2
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 09 May 2013 13:51:13 -0700 (PDT)
In-Reply-To: <1366826950-11962-1-git-send-email-ville.syrjala@linux.intel.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>
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: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

2013/4/24  <ville.syrjala@linux.intel.com>:
> From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
>
> If the calculated FBC watermark is no good, we simply disable FBC
> watermarks. But we fail to re-enable them later if the calculated
> watermark becomes good again. Fix that, but remember to leave FBC
> watermarks disabled on ILK since that's required by some workarounds.
>
> v2: Fix checkpatch complaint
>
> Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

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

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel=
_pm.c
> index 3534a71..da8f307 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1633,6 +1633,10 @@ static bool ironlake_check_srwm(struct drm_device =
*dev, int level,
>                 I915_WRITE(DISP_ARB_CTL,
>                            I915_READ(DISP_ARB_CTL) | DISP_FBC_WM_DIS);
>                 return false;
> +       } else if (INTEL_INFO(dev)->gen >=3D 6) {
> +               /* enable FBC WM (except on ILK, where it must remain off=
) */
> +               I915_WRITE(DISP_ARB_CTL,
> +                          I915_READ(DISP_ARB_CTL) & ~DISP_FBC_WM_DIS);
>         }
>
>         if (display_wm > display->max_wm) {
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- =

Paulo Zanoni