From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Disable self-refresh for untiled fbs on i915gm Date: Mon, 7 Apr 2014 08:57:13 +0200 Message-ID: <20140407065713.GD9262@phenom.ffwll.local> References: <1396853661-26722-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: Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FC736E4FE for ; Sun, 6 Apr 2014 23:57:18 -0700 (PDT) Received: by mail-ee0-f45.google.com with SMTP id d17so267386eek.32 for ; Sun, 06 Apr 2014 23:57:16 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1396853661-26722-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Krzysztof Mazur , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Apr 07, 2014 at 08:54:21AM +0200, Daniel Vetter wrote: > Apparently it doesn't work. X-tiled self-refresh works flawlessly > otoh. It's unclear whether this just borked wm setup from our side or > a hw restriction, but just disabling gets things going. Oops, I've forgotten to add that apparently X still works correctly with linear framebuffers, so might just be an issue with the initial modeset. Whatever, this gets that old gen3 chip going again ;-) -Daniel > = > Note that this regression was only brought to light with > = > commit 3f2dc5ac05714711fc14f2bf0ee5e42d5c08c581 > Author: Ville Syrj=E4l=E4 > Date: Fri Jan 10 14:06:47 2014 +0200 > = > drm/i915: Fix 915GM self-refresh enable/disable > = > before that self-refresh for i915GM didn't work at all. > = > Kudos to Ville for spotting a little bug in the original patch I've > attached to the bug. > = > Cc: Ville Syrj=E4l=E4 > Cc: Chris Wilson > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D76103 > Tested-by: Krzysztof Mazur > Cc: Krzysztof Mazur > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index c849986b40de..6e1a644b6330 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -1545,6 +1545,14 @@ static void i9xx_update_wm(struct drm_crtc *unused= _crtc) > = > DRM_DEBUG_KMS("FIFO watermarks - A: %d, B: %d\n", planea_wm, planeb_wm); > = > + if (IS_I915GM(dev) && enabled) { > + struct intel_framebuffer *fb =3D to_intel_framebuffer(enabled->fb); > + > + /* self-refresh seems busted with untiled */ > + if (fb->obj->tiling_mode =3D=3D I915_TILING_NONE) > + enabled =3D NULL; > + } > + > /* > * Overlay gets an aggressive default since video jitter is bad. > */ > -- = > 1.8.5.2 > = -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch