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: Fix gen3 self-refresh watermarks
Date: Wed, 20 Nov 2013 16:47:14 +0200
Message-ID: <20131120144714.GB7819@intel.com>
References: <1384956130-5661-1-git-send-email-daniel.vetter@ffwll.ch>
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 B45371069D9
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 20 Nov 2013 06:47:18 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <1384956130-5661-1-git-send-email-daniel.vetter@ffwll.ch>
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Wed, Nov 20, 2013 at 03:02:10PM +0100, Daniel Vetter wrote:
> This regression has been introduced in
> =

> commit 4fe8590a921d0b2e36e542dbfa89a8c5993f5a3f
> Author: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> Date:   Wed Sep 4 18:25:22 2013 +0300
> =

>     drm/i915: Use adjusted_mode appropriately when computing watermarks
> =

> I guess we should renable the enabled local variable into something a
> notch more descriptive, but that's something for -next.
> =

> The effect on my i945gme netbook is pretty severe amounts of underruns
> - usually the very first pixel gets used for the entire screeen.
> =

> Cc: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> Cc: Damien Lespiau <damien.lespiau@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Dang. Copy paste fail on my part :( The fix looks 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 172efa0bfb86..3cc757ff60ee 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1625,7 +1625,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_=
crtc)
>  			&to_intel_crtc(enabled)->config.adjusted_mode;
>  		int clock =3D adjusted_mode->crtc_clock;
>  		int htotal =3D adjusted_mode->htotal;
> -		int hdisplay =3D to_intel_crtc(crtc)->config.pipe_src_w;
> +		int hdisplay =3D to_intel_crtc(enabled)->config.pipe_src_w;
>  		int pixel_size =3D enabled->fb->bits_per_pixel / 8;
>  		unsigned long line_time_us;
>  		int entries;
> -- =

> 1.8.1.4

-- =

Ville Syrj=E4l=E4
Intel OTC