From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBosBbCEHZhS9+1M5WqbQ0oY28zVF6HL6rn9LefeAZYsfOWsSh5Ge2PVZ7vbl4Cy8oyi9imkm ARC-Seal: i=1; a=rsa-sha256; t=1516020609; cv=none; d=google.com; s=arc-20160816; b=PsMDlQMqFl3e4nMaVbS9GGcaK/U+l2pdrVOCk5378MbgdoPp0B/IogGScScjXSdH2m 9PrNRsxbbqrfiMgjU0+i5xN2VMceQzaPp311u2BOl+nAgAuVoJRiy1IB4qADA2qevE0X hM30lSswXX+G6hpmNIikvCMUTExeAUmR/Yqpq9M4cJycbBX/9u90xy5VbJZbhxgVdm1e hC7+v6pe53F1LzVD631592+5P5GlYwvkMNrL8I6GUKjrqwh0tQJtIPcxE93I/okdCKnn KwLyueGJFw6jag3K+qMvS6UNIKeHOoo6a4McDGu+UVzpVTPMQZNE4zeo+chIGt24NYIT kWEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Lnx5KcswU9HX2DYSpb+4BbjlXIK2ocpn4i/qdg0m+TY=; b=sVVHq+56YquR+8Odcdvipl9Cnim9KtstFh1uTqolJeDFuvbwYzWf1xs/R69yqf6V8S azgdUw9aO8pjTSWSGJqMZP6zBexknyq8YwteiN6sVrcQtZSVrzdiYpSCWd91W9TmpEHY cFWxgT/d/yS7QzmyZbm/W5Mv4Hvo2ptWD9zFd6Ybx9M05mUVPfG++vpMDh/OJrsPdq75 2cpMe0y1dCRHLAe0S4mSGijdwtX4ToZVQY5dE1GVpNDkEGcWXkWvVq1Ht+vFySu4/rf6 QtvEHvdsX3Kr7OAv3aGpwFRrhG1juG1UvgnyifiuPEomYrh1rA01yeseoci7sFWmIsgm ahag== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Rodrigo Vivi , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula Subject: [PATCH 4.14 071/118] drm/i915: Fix init_clock_gating for resume Date: Mon, 15 Jan 2018 13:34:58 +0100 Message-Id: <20180115123419.737029649@linuxfoundation.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115123415.325497625@linuxfoundation.org> References: <20180115123415.325497625@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1589662826336486602?= X-GMAIL-MSGID: =?utf-8?q?1589662826336486602?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä commit 3572f04c69ed4369da5d3c65d84fb18774aa60b6 upstream. 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: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_drv.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1693,6 +1693,7 @@ static int i915_drm_resume(struct drm_de 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)