From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com ([192.55.52.88]:22470 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821AbdLDMyf (ORCPT ); Mon, 4 Dec 2017 07:54:35 -0500 Date: Mon, 4 Dec 2017 14:54:31 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: gregkh@linuxfoundation.org Cc: chris@chris-wilson.co.uk, jani.nikula@intel.com, rodrigo.vivi@intel.com, stable@vger.kernel.org Subject: Re: WTF: patch "[PATCH] drm/i915: Fix init_clock_gating for resume" was seriously submitted to be applied to the 4.14-stable tree? Message-ID: <20171204125431.GQ10981@intel.com> References: <151239096842223@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <151239096842223@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Dec 04, 2017 at 01:36:08PM +0100, gregkh@linuxfoundation.org wrote: > The patch below was submitted to be applied to the 4.14-stable tree. > > I fail to see how this patch meets the stable kernel rules as found at > Documentation/process/stable-kernel-rules.rst. It fixes a regression. Why do you think it's not suitable for stable? > > I could be totally wrong, and if so, please respond to > and let me know why this patch should be > applied. Otherwise, it is now dropped from my patch queues, never to be > seen again. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > >From 3572f04c69ed4369da5d3c65d84fb18774aa60b6 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= > Date: Thu, 16 Nov 2017 18:02:15 +0200 > Subject: [PATCH] drm/i915: Fix init_clock_gating for resume > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > Moving the init_clock_gating() call from intel_modeset_init_hw() to > intel_modeset_gem_init() had an unintended effect of not applying > some workarounds on resume. This, for example, cause some kind of > corruption to appear at the top of my IVB Thinkpad X1 Carbon LVDS > screen after hibernation. Fix the problem by explicitly calling > init_clock_gating() from the resume path. > > I really hope this doesn't break something else again. At least > the problems reported at https://bugs.freedesktop.org/show_bug.cgi?id=103549 > didn't make a comeback, even after a hibernate cycle. > > v2: Reorder the init_clock_gating vs. modeset_init_hw to match > the display reset path (Rodrigo) > > Cc: stable@vger.kernel.org > Cc: Chris Wilson > Cc: Rodrigo Vivi > Fixes: 6ac43272768c ("drm/i915: Move init_clock_gating() back to where it was") > Reviewed-by: Rodrigo Vivi > Reviewed-by: Chris Wilson > Link: https://patchwork.freedesktop.org/patch/msgid/20171116160215.25715-1-ville.syrjala@linux.intel.com > Signed-off-by: Ville Syrj�l� > (cherry picked from commit 675f7ff35bd256e65d3d0f52718d8babf5d1002a) > Signed-off-by: Jani Nikula > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 34191028bbad..7d9b07df32fa 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1714,6 +1714,7 @@ static int i915_drm_resume(struct drm_device *dev) > intel_guc_resume(dev_priv); > > intel_modeset_init_hw(dev); > + intel_init_clock_gating(dev_priv); > > spin_lock_irq(&dev_priv->irq_lock); > if (dev_priv->display.hpd_irq_setup) -- Ville Syrj�l� Intel OTC