From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.10 01/29] drm/i915: Fix forcewake active domain tracking Date: Sun, 16 Apr 2017 10:04:18 +0200 Message-ID: <20170416080227.671834007@linuxfoundation.org> References: <20170416080227.593797230@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id AEBE2891DA for ; Sun, 16 Apr 2017 08:06:18 +0000 (UTC) In-Reply-To: <20170416080227.593797230@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org Cc: Jani Nikula , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, "Paneri, Praveen" , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org NC4xMC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgoKY29tbWl0IDZhZWY2NjAzNzBhOWMyNDY5 NTZiYTZkMDFlZWJkODA2M2M0MjE0Y2IgdXBzdHJlYW0uCgpJbiBjb21taXQgMDAzMzQyYTUwMDIx ICgiZHJtL2k5MTU6IEtlZXAgdHJhY2sgb2YgYWN0aXZlCmZvcmNld2FrZSBkb21haW5zIGluIGEg Yml0bWFzayIpIEkgZm9yZ290IHRvIGFkanVzdCB0aGUKbmV3bHkgaW50cm9kdWNlIGZ3X2RvbWFp bnNfYWN0aXZlIHN0YXRlIGFjcm9zcyByZXNldC4KClRoaXMgY2F1c2VkIHRoZSBhc3NlcnRfZm9y Y2V3YWtlc19pbmFjdGl2ZSB0byB0cmlnZ2VyCmR1cmluZyBzdXNwZW5kIGFuZCByZXN1bWUgaWYg dGhlcmUgd2VyZSB1c2VyIGhlbGQKZm9yY2V3YWtlcy4KCnYyOiBCaXRtYXNrIGNoZWNrcyBhcmUg cmVxdWlyZWQgc2luY2UgdmZ1bmNzIGFyZSBub3QKICAgIGFsd2F5cyBwcmVzZW50LgoKdjM6IE1v dmUgYml0bWFzayB0cmFja2luZyB0byBnZXQvcHV0IHZmdW5jIGZvciBzaW1wbGljaXR5LgogICAg KENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+CkZpeGVzOiAwMDMzNDJhNTAwMjEgKCJkcm0vaTkxNTogS2VlcCB0cmFj ayBvZiBhY3RpdmUgZm9yY2V3YWtlIGRvbWFpbnMgaW4gYSBiaXRtYXNrIikKVGVzdGNhc2U6IGln dC9kcnZfc3VzcGVuZC9mb3JjZXdha2UKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxp bkBpbnRlbC5jb20+CkNjOiAiUGFuZXJpLCBQcmF2ZWVuIiA8cHJhdmVlbi5wYW5lcmlAaW50ZWwu Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5p Lm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBpbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K TGluazogaHR0cDovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxNzAz MTAwOTMyNDkuNDQ4NC0xLXR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbQooY2hlcnJ5IHBp Y2tlZCBmcm9tIGNvbW1pdCBiODQ3MzA1MDgwNWYzNWFkZDk3ZjNmZjU3NTcwZDU1YTAxODA4ZGY1 KQpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3Jn PgoKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8ICAgMTMgKysrKysr LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkK Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0xMTksNiArMTE5LDggQEAgZndfZG9tYWlu c19nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKgogCiAJZm9yX2VhY2hfZndfZG9tYWluX21h c2tlZChkLCBmd19kb21haW5zLCBkZXZfcHJpdikKIAkJZndfZG9tYWluX3dhaXRfYWNrKGQpOwor CisJZGV2X3ByaXYtPnVuY29yZS5md19kb21haW5zX2FjdGl2ZSB8PSBmd19kb21haW5zOwogfQog CiBzdGF0aWMgdm9pZApAQCAtMTMwLDYgKzEzMiw4IEBAIGZ3X2RvbWFpbnNfcHV0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICoKIAkJZndfZG9tYWluX3B1dChkKTsKIAkJZndfZG9tYWluX3Bvc3Rp bmdfcmVhZChkKTsKIAl9CisKKwlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnNfYWN0aXZlICY9 IH5md19kb21haW5zOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMjQwLDEwICsyNDQsOCBAQCBpbnRl bF91bmNvcmVfZndfcmVsZWFzZV90aW1lcihzdHJ1Y3QgaHJ0CiAJaWYgKFdBUk5fT04oZG9tYWlu LT53YWtlX2NvdW50ID09IDApKQogCQlkb21haW4tPndha2VfY291bnQrKzsKIAotCWlmICgtLWRv bWFpbi0+d2FrZV9jb3VudCA9PSAwKSB7CisJaWYgKC0tZG9tYWluLT53YWtlX2NvdW50ID09IDAp CiAJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsIGRvbWFp bi0+bWFzayk7Ci0JCWRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc19hY3RpdmUgJj0gfmRvbWFp bi0+bWFzazsKLQl9CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+dW5jb3Jl LmxvY2ssIGlycWZsYWdzKTsKIApAQCAtNDU1LDEwICs0NTcsOCBAQCBzdGF0aWMgdm9pZCBfX2lu dGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0CiAJCQlmd19kb21haW5zICY9IH5kb21haW4tPm1hc2s7 CiAJfQogCi0JaWYgKGZ3X2RvbWFpbnMpIHsKKwlpZiAoZndfZG9tYWlucykKIAkJZGV2X3ByaXYt PnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgZndfZG9tYWlucyk7Ci0JCWRl dl9wcml2LT51bmNvcmUuZndfZG9tYWluc19hY3RpdmUgfD0gZndfZG9tYWluczsKLQl9CiB9CiAK IC8qKgpAQCAtOTYyLDcgKzk2Miw2IEBAIHN0YXRpYyBub2lubGluZSB2b2lkIF9fX2ZvcmNlX3dh a2VfYXV0bygKIAkJZndfZG9tYWluX2FybV90aW1lcihkb21haW4pOwogCiAJZGV2X3ByaXYtPnVu Y29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgZndfZG9tYWlucyk7Ci0JZGV2X3By aXYtPnVuY29yZS5md19kb21haW5zX2FjdGl2ZSB8PSBmd19kb21haW5zOwogfQogCiBzdGF0aWMg aW5saW5lIHZvaWQgX19mb3JjZV93YWtlX2F1dG8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932397AbdDPINO (ORCPT ); Sun, 16 Apr 2017 04:13:14 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:57034 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932266AbdDPIGT (ORCPT ); Sun, 16 Apr 2017 04:06:19 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tvrtko Ursulin , "Paneri, Praveen" , Chris Wilson , Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, Jani Nikula Subject: [PATCH 4.10 01/29] drm/i915: Fix forcewake active domain tracking Date: Sun, 16 Apr 2017 10:04:18 +0200 Message-Id: <20170416080227.671834007@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170416080227.593797230@linuxfoundation.org> References: <20170416080227.593797230@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tvrtko Ursulin commit 6aef660370a9c246956ba6d01eebd8063c4214cb upstream. In commit 003342a50021 ("drm/i915: Keep track of active forcewake domains in a bitmask") I forgot to adjust the newly introduce fw_domains_active state across reset. This caused the assert_forcewakes_inactive to trigger during suspend and resume if there were user held forcewakes. v2: Bitmask checks are required since vfuncs are not always present. v3: Move bitmask tracking to get/put vfunc for simplicity. (Chris Wilson) Signed-off-by: Tvrtko Ursulin Fixes: 003342a50021 ("drm/i915: Keep track of active forcewake domains in a bitmask") Testcase: igt/drv_suspend/forcewake Cc: Tvrtko Ursulin Cc: "Paneri, Praveen" Cc: Chris Wilson Cc: Daniel Vetter Cc: Jani Nikula Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Chris Wilson Link: http://patchwork.freedesktop.org/patch/msgid/20170310093249.4484-1-tvrtko.ursulin@linux.intel.com (cherry picked from commit b8473050805f35add97f3ff57570d55a01808df5) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_uncore.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -119,6 +119,8 @@ fw_domains_get(struct drm_i915_private * for_each_fw_domain_masked(d, fw_domains, dev_priv) fw_domain_wait_ack(d); + + dev_priv->uncore.fw_domains_active |= fw_domains; } static void @@ -130,6 +132,8 @@ fw_domains_put(struct drm_i915_private * fw_domain_put(d); fw_domain_posting_read(d); } + + dev_priv->uncore.fw_domains_active &= ~fw_domains; } static void @@ -240,10 +244,8 @@ intel_uncore_fw_release_timer(struct hrt if (WARN_ON(domain->wake_count == 0)) domain->wake_count++; - if (--domain->wake_count == 0) { + if (--domain->wake_count == 0) dev_priv->uncore.funcs.force_wake_put(dev_priv, domain->mask); - dev_priv->uncore.fw_domains_active &= ~domain->mask; - } spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); @@ -455,10 +457,8 @@ static void __intel_uncore_forcewake_get fw_domains &= ~domain->mask; } - if (fw_domains) { + if (fw_domains) dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_domains); - dev_priv->uncore.fw_domains_active |= fw_domains; - } } /** @@ -962,7 +962,6 @@ static noinline void ___force_wake_auto( fw_domain_arm_timer(domain); dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_domains); - dev_priv->uncore.fw_domains_active |= fw_domains; } static inline void __force_wake_auto(struct drm_i915_private *dev_priv,