From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: use crtc_htotal when calculating
	ilk watermarks
Date: Wed, 8 Jan 2014 11:27:50 +0200
Message-ID: <20140108092750.GI4800@intel.com>
References: <1387573680-2734-1-git-send-email-jbarnes@virtuousgeek.org>
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 mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 1876CFB0BB
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  8 Jan 2014 01:27:54 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <1387573680-2734-1-git-send-email-jbarnes@virtuousgeek.org>
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@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Dec 20, 2013 at 01:08:00PM -0800, Jesse Barnes wrote:
> This was introduced in:
> =

> commit 7c4a395ff8f441acb7876281c6777624e6410349
> Author: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> Date:   Wed Oct 9 19:17:56 2013 +0300
> =

>     drm/i915: Don't re-compute pipe watermarks except for the affected pi=
pe

git blame tells me the code has been like that since its introduction
in:

commit 801bcfffbb0721d7131e930f9a46103e539c43a4
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Fri May 31 10:08:35 2013 -0300

    drm/i915: properly set HSW WM_PIPE registers

> =

> and I missed fixing it in:
> =

> commit fec8cba306f974f3a4491176994de5d821273643
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Wed Nov 27 11:10:26 2013 -0800
> =

>     drm/i915: use crtc_htotal in watermark calculations to match fastboot=
 v2
> =

> It's needed for ILK+ platforms to fastboot without crashing on a divide
> by 0 after a DPMS on action.
> =

> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

grep didn't find any more non-crtc_ values in intel_pm.c, so hopefully
we're now good.

Reviewed-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> =

> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel=
_pm.c
> index 469170c..0f1efa4 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2124,7 +2124,7 @@ static void ilk_compute_wm_parameters(struct drm_cr=
tc *crtc,
>  =

>  	p->active =3D intel_crtc_active(crtc);
>  	if (p->active) {
> -		p->pipe_htotal =3D intel_crtc->config.adjusted_mode.htotal;
> +		p->pipe_htotal =3D intel_crtc->config.adjusted_mode.crtc_htotal;
>  		p->pixel_rate =3D ilk_pipe_pixel_rate(dev, crtc);
>  		p->pri.bytes_per_pixel =3D crtc->fb->bits_per_pixel / 8;
>  		p->cur.bytes_per_pixel =3D 4;
> -- =

> 1.7.9.5

-- =

Ville Syrj=E4l=E4
Intel OTC