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ä <[email protected]> > 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ä <[email protected]> > Cc: Chris Wilson <[email protected]> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76103 > Tested-by: Krzysztof Mazur <[email protected]> > Cc: Krzysztof Mazur <[email protected]> > Cc: [email protected] > Signed-off-by: Daniel Vetter <[email protected]> > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
