From: Daniel Vetter <daniel@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Krzysztof Mazur <krzysiek@podlesie.net>,
stable@vger.kernel.org
Subject: Re: [PATCH] drm/i915: Disable self-refresh for untiled fbs on i915gm
Date: Mon, 7 Apr 2014 08:57:13 +0200 [thread overview]
Message-ID: <20140407065713.GD9262@phenom.ffwll.local> (raw)
In-Reply-To: <1396853661-26722-1-git-send-email-daniel.vetter@ffwll.ch>
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älä <ville.syrjala@linux.intel.com>
> 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älä <ville.syrjala@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76103
> Tested-by: Krzysztof Mazur <krzysiek@podlesie.net>
> Cc: Krzysztof Mazur <krzysiek@podlesie.net>
> Cc: stable@vger.kernel.org
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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 = to_intel_framebuffer(enabled->fb);
> +
> + /* self-refresh seems busted with untiled */
> + if (fb->obj->tiling_mode == I915_TILING_NONE)
> + enabled = 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
prev parent reply other threads:[~2014-04-07 6:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-07 6:54 [PATCH] drm/i915: Disable self-refresh for untiled fbs on i915gm Daniel Vetter
2014-04-07 6:57 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140407065713.GD9262@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=krzysiek@podlesie.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.