From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 20/23] drm/i915: Support whitelist workarounds on all engines Date: Tue, 3 Sep 2019 12:24:21 -0400 Message-ID: <20190903162424.6877-20-sashal@kernel.org> References: <20190903162424.6877-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162424.6877-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Tvrtko Ursulin , "Robert M . Fosha" , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, John Harrison List-Id: dri-devel@lists.freedesktop.org RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClsgVXBzdHJl YW0gY29tbWl0IGViZDJkZTQ3YTE5ZjFjMTdhZTQ3ZjgzMzFhYWUzY2Q0MzY3NjY2NjMgXQoKTmV3 ZXIgaGFyZHdhcmUgcmVxdWlyZXMgc2V0dGluZyB1cCB3aGl0ZWxpc3RzIG9uIGVuZ2luZXMgb3Ro ZXIgdGhhbgpyZW5kZXIuIFNvLCBleHRlbmQgdGhlIHdoaXRlbGlzdCBjb2RlIHRvIHN1cHBvcnQg YWxsIGVuZ2luZXMuCgpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlz b25ASW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgTS4gRm9zaGEgPHJvYmVydC5tLmZv c2hhQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQt Ynk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ckxpbms6IGh0dHBz Oi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE5MDYxODAxMDEwOC4y NzQ5OS0zLUpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2 aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dv cmthcm91bmRzLmMgfCA2NSArKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NyBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfd29ya2Fyb3VuZHMuYwppbmRleCAxZGI4MjZiMTI3NzRlLi4wYjgwZmRlOTI3ODk5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTEwMTIsNDggKzEw MTIsNzkgQEAgc3RhdGljIHZvaWQgZ2VuOV93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGk5MTVfd2Ff bGlzdCAqdykKIAl3aGl0ZWxpc3RfcmVnKHcsIEdFTjhfSERDX0NISUNLRU4xKTsKIH0KIAotc3Rh dGljIHZvaWQgc2tsX3doaXRlbGlzdF9idWlsZChzdHJ1Y3QgaTkxNV93YV9saXN0ICp3KQorc3Rh dGljIHZvaWQgc2tsX3doaXRlbGlzdF9idWlsZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CisJc3RydWN0IGk5MTVfd2FfbGlzdCAqdyA9ICZlbmdpbmUtPndoaXRlbGlzdDsKKwor CWlmIChlbmdpbmUtPmNsYXNzICE9IFJFTkRFUl9DTEFTUykKKwkJcmV0dXJuOworCiAJZ2VuOV93 aGl0ZWxpc3RfYnVpbGQodyk7CiAKIAkvKiBXYURpc2FibGVMU1FDUk9QRVJGZm9yT0NMOnNrbCAq LwogCXdoaXRlbGlzdF9yZWcodywgR0VOOF9MM1NRQ1JFRzQpOwogfQogCi1zdGF0aWMgdm9pZCBi eHRfd2hpdGVsaXN0X2J1aWxkKHN0cnVjdCBpOTE1X3dhX2xpc3QgKncpCitzdGF0aWMgdm9pZCBi eHRfd2hpdGVsaXN0X2J1aWxkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQln ZW45X3doaXRlbGlzdF9idWlsZCh3KTsKKwlpZiAoZW5naW5lLT5jbGFzcyAhPSBSRU5ERVJfQ0xB U1MpCisJCXJldHVybjsKKworCWdlbjlfd2hpdGVsaXN0X2J1aWxkKCZlbmdpbmUtPndoaXRlbGlz dCk7CiB9CiAKLXN0YXRpYyB2b2lkIGtibF93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGk5MTVfd2Ff bGlzdCAqdykKK3N0YXRpYyB2b2lkIGtibF93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogeworCXN0cnVjdCBpOTE1X3dhX2xpc3QgKncgPSAmZW5naW5lLT53 aGl0ZWxpc3Q7CisKKwlpZiAoZW5naW5lLT5jbGFzcyAhPSBSRU5ERVJfQ0xBU1MpCisJCXJldHVy bjsKKwogCWdlbjlfd2hpdGVsaXN0X2J1aWxkKHcpOwogCiAJLyogV2FEaXNhYmxlTFNRQ1JPUEVS RmZvck9DTDprYmwgKi8KIAl3aGl0ZWxpc3RfcmVnKHcsIEdFTjhfTDNTUUNSRUc0KTsKIH0KIAot c3RhdGljIHZvaWQgZ2xrX3doaXRlbGlzdF9idWlsZChzdHJ1Y3QgaTkxNV93YV9saXN0ICp3KQor c3RhdGljIHZvaWQgZ2xrX3doaXRlbGlzdF9idWlsZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiB7CisJc3RydWN0IGk5MTVfd2FfbGlzdCAqdyA9ICZlbmdpbmUtPndoaXRlbGlzdDsK KworCWlmIChlbmdpbmUtPmNsYXNzICE9IFJFTkRFUl9DTEFTUykKKwkJcmV0dXJuOworCiAJZ2Vu OV93aGl0ZWxpc3RfYnVpbGQodyk7CiAKIAkvKiBXQSAjMDg2MjogVXNlcnNwYWNlIGhhcyB0byBz ZXQgIkJhcnJpZXIgTW9kZSIgdG8gYXZvaWQgaGFuZ3MuICovCiAJd2hpdGVsaXN0X3JlZyh3LCBH RU45X1NMSUNFX0NPTU1PTl9FQ09fQ0hJQ0tFTjEpOwogfQogCi1zdGF0aWMgdm9pZCBjZmxfd2hp dGVsaXN0X2J1aWxkKHN0cnVjdCBpOTE1X3dhX2xpc3QgKncpCitzdGF0aWMgdm9pZCBjZmxfd2hp dGVsaXN0X2J1aWxkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlnZW45X3do aXRlbGlzdF9idWlsZCh3KTsKKwlpZiAoZW5naW5lLT5jbGFzcyAhPSBSRU5ERVJfQ0xBU1MpCisJ CXJldHVybjsKKworCWdlbjlfd2hpdGVsaXN0X2J1aWxkKCZlbmdpbmUtPndoaXRlbGlzdCk7CiB9 CiAKLXN0YXRpYyB2b2lkIGNubF93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGk5MTVfd2FfbGlzdCAq dykKK3N0YXRpYyB2b2lkIGNubF93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQogeworCXN0cnVjdCBpOTE1X3dhX2xpc3QgKncgPSAmZW5naW5lLT53aGl0ZWxp c3Q7CisKKwlpZiAoZW5naW5lLT5jbGFzcyAhPSBSRU5ERVJfQ0xBU1MpCisJCXJldHVybjsKKwog CS8qIFdhRW5hYmxlUHJlZW1wdGlvbkdyYW51bGFyaXR5Q29udHJvbEJ5VU1EOmNubCAqLwogCXdo aXRlbGlzdF9yZWcodywgR0VOOF9DU19DSElDS0VOMSk7CiB9CiAKLXN0YXRpYyB2b2lkIGljbF93 aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGk5MTVfd2FfbGlzdCAqdykKK3N0YXRpYyB2b2lkIGljbF93 aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogeworCXN0cnVj dCBpOTE1X3dhX2xpc3QgKncgPSAmZW5naW5lLT53aGl0ZWxpc3Q7CisKKwlpZiAoZW5naW5lLT5j bGFzcyAhPSBSRU5ERVJfQ0xBU1MpCisJCXJldHVybjsKKwogCS8qIFdhQWxsb3dVTURUb01vZGlm eUhhbGZTbGljZUNoaWNrZW43OmljbCAqLwogCXdoaXRlbGlzdF9yZWcodywgR0VOOV9IQUxGX1NM SUNFX0NISUNLRU43KTsKIApAQCAtMTA2OSwyNCArMTEwMCwyMiBAQCB2b2lkIGludGVsX2VuZ2lu ZV9pbml0X3doaXRlbGlzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBlbmdpbmUtPmk5MTU7CiAJc3RydWN0IGk5MTVfd2Ff bGlzdCAqdyA9ICZlbmdpbmUtPndoaXRlbGlzdDsKIAotCUdFTV9CVUdfT04oZW5naW5lLT5pZCAh PSBSQ1MwKTsKLQogCXdhX2luaXRfc3RhcnQodywgIndoaXRlbGlzdCIpOwogCiAJaWYgKElTX0dF TihpOTE1LCAxMSkpCi0JCWljbF93aGl0ZWxpc3RfYnVpbGQodyk7CisJCWljbF93aGl0ZWxpc3Rf YnVpbGQoZW5naW5lKTsKIAllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQotCQljbmxfd2hp dGVsaXN0X2J1aWxkKHcpOworCQljbmxfd2hpdGVsaXN0X2J1aWxkKGVuZ2luZSk7CiAJZWxzZSBp ZiAoSVNfQ09GRkVFTEFLRShpOTE1KSkKLQkJY2ZsX3doaXRlbGlzdF9idWlsZCh3KTsKKwkJY2Zs X3doaXRlbGlzdF9idWlsZChlbmdpbmUpOwogCWVsc2UgaWYgKElTX0dFTUlOSUxBS0UoaTkxNSkp Ci0JCWdsa193aGl0ZWxpc3RfYnVpbGQodyk7CisJCWdsa193aGl0ZWxpc3RfYnVpbGQoZW5naW5l KTsKIAllbHNlIGlmIChJU19LQUJZTEFLRShpOTE1KSkKLQkJa2JsX3doaXRlbGlzdF9idWlsZCh3 KTsKKwkJa2JsX3doaXRlbGlzdF9idWlsZChlbmdpbmUpOwogCWVsc2UgaWYgKElTX0JST1hUT04o aTkxNSkpCi0JCWJ4dF93aGl0ZWxpc3RfYnVpbGQodyk7CisJCWJ4dF93aGl0ZWxpc3RfYnVpbGQo ZW5naW5lKTsKIAllbHNlIGlmIChJU19TS1lMQUtFKGk5MTUpKQotCQlza2xfd2hpdGVsaXN0X2J1 aWxkKHcpOworCQlza2xfd2hpdGVsaXN0X2J1aWxkKGVuZ2luZSk7CiAJZWxzZSBpZiAoSU5URUxf R0VOKGk5MTUpIDw9IDgpCiAJCXJldHVybjsKIAllbHNlCi0tIAoyLjIwLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC1B0C3A5A7 for ; Tue, 3 Sep 2019 16:40:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A342A2339D for ; Tue, 3 Sep 2019 16:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528812; bh=ZnpwUH/bPiEE4wslv4yPlhf2ZtPaAnT2HGWxhurSN98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LETAAv8+C8Xvfv58euSoRB0oOYZB+kxgrEFpajv/wqJg2ITxWuOO+V2NTnOU56tnY 12rthWFzI9DpJmd2gnlMLFGiPl0SvHRCITZNiqzGGj588o3I/my23oAUM1vjy+2l/O 8mhF1jAYaEQHXnUYK7XWDVb5Q+4KJr6nulMxUbOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730360AbfICQZW (ORCPT ); Tue, 3 Sep 2019 12:25:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730307AbfICQZM (ORCPT ); Tue, 3 Sep 2019 12:25:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3490A2343A; Tue, 3 Sep 2019 16:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527911; bh=ZnpwUH/bPiEE4wslv4yPlhf2ZtPaAnT2HGWxhurSN98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1+a3l8pYptK6lnQ+XfHUf+FPXUpOmv0zmCRn8M60zeClwUOwfj2ZdqUXaxvxEtpO1 km0lM/t5bUg80YDXDGk7QQWzlz8rBrtHf3rCYc4C5QEdJCR7/k3/Mx2jzgLmnmDNGh 9df/qUrFX7r4osWDGDUMS3TMBaP7h6Mi/+wkc4jI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Harrison , "Robert M . Fosha" , Tvrtko Ursulin , Chris Wilson , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 20/23] drm/i915: Support whitelist workarounds on all engines Date: Tue, 3 Sep 2019 12:24:21 -0400 Message-Id: <20190903162424.6877-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162424.6877-1-sashal@kernel.org> References: <20190903162424.6877-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Harrison [ Upstream commit ebd2de47a19f1c17ae47f8331aae3cd436766663 ] Newer hardware requires setting up whitelists on engines other than render. So, extend the whitelist code to support all engines. Signed-off-by: John Harrison Signed-off-by: Robert M. Fosha Cc: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Tvrtko Ursulin Signed-off-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20190618010108.27499-3-John.C.Harrison@Intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_workarounds.c | 65 +++++++++++++++++------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index 1db826b12774e..0b80fde927899 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -1012,48 +1012,79 @@ static void gen9_whitelist_build(struct i915_wa_list *w) whitelist_reg(w, GEN8_HDC_CHICKEN1); } -static void skl_whitelist_build(struct i915_wa_list *w) +static void skl_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + + if (engine->class != RENDER_CLASS) + return; + gen9_whitelist_build(w); /* WaDisableLSQCROPERFforOCL:skl */ whitelist_reg(w, GEN8_L3SQCREG4); } -static void bxt_whitelist_build(struct i915_wa_list *w) +static void bxt_whitelist_build(struct intel_engine_cs *engine) { - gen9_whitelist_build(w); + if (engine->class != RENDER_CLASS) + return; + + gen9_whitelist_build(&engine->whitelist); } -static void kbl_whitelist_build(struct i915_wa_list *w) +static void kbl_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + + if (engine->class != RENDER_CLASS) + return; + gen9_whitelist_build(w); /* WaDisableLSQCROPERFforOCL:kbl */ whitelist_reg(w, GEN8_L3SQCREG4); } -static void glk_whitelist_build(struct i915_wa_list *w) +static void glk_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + + if (engine->class != RENDER_CLASS) + return; + gen9_whitelist_build(w); /* WA #0862: Userspace has to set "Barrier Mode" to avoid hangs. */ whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1); } -static void cfl_whitelist_build(struct i915_wa_list *w) +static void cfl_whitelist_build(struct intel_engine_cs *engine) { - gen9_whitelist_build(w); + if (engine->class != RENDER_CLASS) + return; + + gen9_whitelist_build(&engine->whitelist); } -static void cnl_whitelist_build(struct i915_wa_list *w) +static void cnl_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + + if (engine->class != RENDER_CLASS) + return; + /* WaEnablePreemptionGranularityControlByUMD:cnl */ whitelist_reg(w, GEN8_CS_CHICKEN1); } -static void icl_whitelist_build(struct i915_wa_list *w) +static void icl_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + + if (engine->class != RENDER_CLASS) + return; + /* WaAllowUMDToModifyHalfSliceChicken7:icl */ whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7); @@ -1069,24 +1100,22 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine) struct drm_i915_private *i915 = engine->i915; struct i915_wa_list *w = &engine->whitelist; - GEM_BUG_ON(engine->id != RCS0); - wa_init_start(w, "whitelist"); if (IS_GEN(i915, 11)) - icl_whitelist_build(w); + icl_whitelist_build(engine); else if (IS_CANNONLAKE(i915)) - cnl_whitelist_build(w); + cnl_whitelist_build(engine); else if (IS_COFFEELAKE(i915)) - cfl_whitelist_build(w); + cfl_whitelist_build(engine); else if (IS_GEMINILAKE(i915)) - glk_whitelist_build(w); + glk_whitelist_build(engine); else if (IS_KABYLAKE(i915)) - kbl_whitelist_build(w); + kbl_whitelist_build(engine); else if (IS_BROXTON(i915)) - bxt_whitelist_build(w); + bxt_whitelist_build(engine); else if (IS_SKYLAKE(i915)) - skl_whitelist_build(w); + skl_whitelist_build(engine); else if (INTEL_GEN(i915) <= 8) return; else -- 2.20.1