From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: Patch "drm/i915: Disable self-refresh for untiled fbs on i915gm" has been added to the 3.14-stable tree Date: Tue, 03 Jun 2014 23:16:51 -0700 Message-ID: <14018626111407@kroah.com> References: <1400663245-15601-2-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: In-Reply-To: <1400663245-15601-2-git-send-email-daniel.vetter@ffwll.ch> Sender: stable-owner@vger.kernel.org To: daniel.vetter@ffwll.ch, chris@chris-wilson.co.uk, gregkh@linuxfoundation.org, intel-gfx@lists.freedesktop.org, jani.nikula@intel.com, krzysiek@podlesie.net, ville.syrjala@linux.intel.com Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org This is a note to let you know that I've just added the patch titled drm/i915: Disable self-refresh for untiled fbs on i915gm to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue= =2Egit;a=3Dsummary The filename of the patch is: drm-i915-disable-self-refresh-for-untiled-fbs-on-i915gm.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree= , please let know about it. =46rom daniel.vetter@ffwll.ch Tue Jun 3 23:12:52 2014 =46rom: Daniel Vetter Date: Wed, 21 May 2014 11:07:22 +0200 Subject: drm/i915: Disable self-refresh for untiled fbs on i915gm To: stable@vger.kernel.org Cc: Intel Graphics Development , Danie= l Vetter , Ville Syrj=E4l=E4 , Chris Wilson , Krzysztof Mazu= r , Jani Nikula Message-ID: <1400663245-15601-2-git-send-email-daniel.vetter@ffwll.ch> =46rom: Daniel Vetter This is commit 2ab1bc9df01dbc19b55b2271100db7 upstream. Apparently it doesn't work. X-tiled self-refresh works flawlessly otoh. Apparently X still works correctly with linear framebuffers, so might just be an issue with the initial modeset. It's unclear whether this just borked wm setup from our side or a hw restriction, but just disabling gets things going. Note that this regression was only brought to light with commit 3f2dc5ac05714711fc14f2bf0ee5e42d5c08c581 Author: Ville Syrj=C3=A4l=C3=A4 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=C3=A4l=C3=A4 Cc: Chris Wilson Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D76103 Tested-by: Krzysztof Mazur Cc: Krzysztof Mazur Reviewed-by: Ville Syrj=C3=A4l=C3=A4 Signed-off-by: Daniel Vetter [Jani: rebase on top of drm-next with primary plane support.] Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1539,6 +1539,16 @@ static void i9xx_update_wm(struct drm_cr =20 DRM_DEBUG_KMS("FIFO watermarks - A: %d, B: %d\n", planea_wm, planeb_w= m); =20 + if (IS_I915GM(dev) && enabled) { + struct intel_framebuffer *fb; + + 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. */ Patches currently in stable-queue which might be from daniel.vetter@ffw= ll.ch are queue-3.14/drm-i915-don-t-warn-nor-handle-unexpected-hpd-interrupts-on-= gmch-platforms.patch queue-3.14/drm-i915-fix-unsafe-loop-iteration-over-vma-whilst-unbinding= -them.patch queue-3.14/drm-i915-disable-self-refresh-for-untiled-fbs-on-i915gm.patc= h queue-3.14/drm-i915-don-t-check-gmch-state-on-inherited-configs.patch queue-3.14/drm-i915-break-encoder-crtc-link-separately-in-intel_sanitiz= e_crtc.patch queue-3.14/drm-i915-quirk-invert-brightness-for-acer-aspire-5336.patch queue-3.14/drm-i915-move-power-domain-init-earlier-during-system-resume= =2Epatch