From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 21/23] drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT Date: Tue, 3 Sep 2019 12:24:22 -0400 Message-ID: <20190903162424.6877-21-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 , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTGlvbmVsIExhbmR3ZXJsaW4gPGxpb25lbC5nLmxhbmR3ZXJsaW5AaW50ZWwuY29tPgoK WyBVcHN0cmVhbSBjb21taXQgNmNlNWJmZTkzNmFjMzFkNWM1MmM0YjEzMjhkMGJmZGE1Zjk3ZTdj YSBdCgpDRkw6QzArIGNoYW5nZWQgdGhlIHN0YXR1cyBvZiB0aG9zZSByZWdpc3RlcnMgd2hpY2gg YXJlIG5vdwpibGFja2xpc3RlZCBieSBkZWZhdWx0LgoKVGhpcyBpcyBicmVha2luZyBhIG51bWJl ciBvZiBDVFMgdGVzdHMgb24gR0wgJiBWdWxrYW4gOgoKICBLSFItR0w0NS5waXBlbGluZV9zdGF0 aXN0aWNzX3F1ZXJ5X3Rlc3RzX0FSQi5mdW5jdGlvbmFsX2ZyYWdtZW50X3NoYWRlcl9pbnZvY2F0 aW9ucyAoR0wpCgogIGRFUVAtVksucXVlcnlfcG9vbC5zdGF0aXN0aWNzX3F1ZXJ5LmZyYWdtZW50 X3NoYWRlcl9pbnZvY2F0aW9ucy4qIChWdWxrYW4pCgp2MjogT25seSB1c2Ugb25lIHdoaXRlbGlz dCBlbnRyeSAoTGlvbmVsKQoKQnNwZWM6IDE0MDkxClNpZ25lZC1vZmYtYnk6IExpb25lbCBMYW5k d2VybGluIDxsaW9uZWwuZy5sYW5kd2VybGluQGludGVsLmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtl cm5lbC5vcmcgIyA2ODgzZWFiMjc0ODE6IGRybS9pOTE1OiBTdXBwb3J0IGZsYWdzIGluIHdoaXRs aXN0IFdBcwpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpBY2tlZC1ieTogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVz a3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTA2MjgxMjA3MjAuMjE2ODItMy1saW9uZWwuZy5sYW5k d2VybGluQGludGVsLmNvbQooY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCAyYzkwM2RhNTBmNWE5 NTIyYjEzNGU0ODhiZDBmOTI2NDZjNDZmM2MwKQpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8 amFuaS5uaWt1bGFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFs QGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMu YyB8IDE3ICsrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5j CmluZGV4IDBiODBmZGU5Mjc4OTkuLmJlMzY4ODkwOGYwY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtMTA2MSwxMCArMTA2MSwyNSBAQCBzdGF0aWMgdm9p ZCBnbGtfd2hpdGVsaXN0X2J1aWxkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAog c3RhdGljIHZvaWQgY2ZsX3doaXRlbGlzdF9idWlsZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiB7CisJc3RydWN0IGk5MTVfd2FfbGlzdCAqdyA9ICZlbmdpbmUtPndoaXRlbGlzdDsK KwogCWlmIChlbmdpbmUtPmNsYXNzICE9IFJFTkRFUl9DTEFTUykKIAkJcmV0dXJuOwogCi0JZ2Vu OV93aGl0ZWxpc3RfYnVpbGQoJmVuZ2luZS0+d2hpdGVsaXN0KTsKKwlnZW45X3doaXRlbGlzdF9i dWlsZCh3KTsKKworCS8qCisJICogV2FBbGxvd1BNRGVwdGhBbmRJbnZvY2F0aW9uQ291bnRBY2Nl c3NGcm9tVU1EOmNmbCx3aGwsY21sLGFtbAorCSAqCisJICogVGhpcyBjb3ZlcnMgNCByZWdpc3Rl ciB3aGljaCBhcmUgbmV4dCB0byBvbmUgYW5vdGhlciA6CisJICogICAtIFBTX0lOVk9DQVRJT05f Q09VTlQKKwkgKiAgIC0gUFNfSU5WT0NBVElPTl9DT1VOVF9VRFcKKwkgKiAgIC0gUFNfREVQVEhf Q09VTlQKKwkgKiAgIC0gUFNfREVQVEhfQ09VTlRfVURXCisJICovCisJd2hpdGVsaXN0X3JlZ19l eHQodywgUFNfSU5WT0NBVElPTl9DT1VOVCwKKwkJCSAgUklOR19GT1JDRV9UT19OT05QUklWX1JE IHwKKwkJCSAgUklOR19GT1JDRV9UT19OT05QUklWX1JBTkdFXzQpOwogfQogCiBzdGF0aWMgdm9p ZCBjbmxfd2hpdGVsaXN0X2J1aWxkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKLS0g CjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=ham 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 895A9C3A5A5 for ; Tue, 3 Sep 2019 16:25:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6421D23697 for ; Tue, 3 Sep 2019 16:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527922; bh=nToPhXUj90HieWOjQ0yRqNGpYJt6WrnFeBUHuwMdMz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ChOHLcLQ+8qMtoH/HhwATfa1o1h8cDwx3aby79CZLMS5Sxd3JZE72IkPMH3fmax21 Ysfk2HYrfQ1hZtiFPJ4IxSAa0IZKLCwik6M4PwyC3eZbLi+HYuMMRRhc+vavHZEe9n bvXaCFXOm9JLzb2nanXVsqCfhSf/BNVci98FcCaM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730348AbfICQZU (ORCPT ); Tue, 3 Sep 2019 12:25:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:44968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730313AbfICQZN (ORCPT ); Tue, 3 Sep 2019 12:25:13 -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 8033C23891; Tue, 3 Sep 2019 16:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527912; bh=nToPhXUj90HieWOjQ0yRqNGpYJt6WrnFeBUHuwMdMz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TB8ykN43HSrnGhuM3rZFYy/ZFojIHnVIp9SEL0nuA3jsPaf2NDepnEyZJY1VU5B2U jd32kXXufxGi5idjRg3LwcAaf7CjQmdYmARlbEHFwxERz33aqVRij7UDyESMdCkk5h eJlXO5G2VIqdolzKxLxmJIfaD52aqn6p4Ojwmc1k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lionel Landwerlin , Chris Wilson , Jani Nikula , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 21/23] drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT Date: Tue, 3 Sep 2019 12:24:22 -0400 Message-Id: <20190903162424.6877-21-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: Lionel Landwerlin [ Upstream commit 6ce5bfe936ac31d5c52c4b1328d0bfda5f97e7ca ] CFL:C0+ changed the status of those registers which are now blacklisted by default. This is breaking a number of CTS tests on GL & Vulkan : KHR-GL45.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations (GL) dEQP-VK.query_pool.statistics_query.fragment_shader_invocations.* (Vulkan) v2: Only use one whitelist entry (Lionel) Bspec: 14091 Signed-off-by: Lionel Landwerlin Cc: stable@vger.kernel.org # 6883eab27481: drm/i915: Support flags in whitlist WAs Cc: stable@vger.kernel.org Acked-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190628120720.21682-3-lionel.g.landwerlin@intel.com (cherry picked from commit 2c903da50f5a9522b134e488bd0f92646c46f3c0) Signed-off-by: Jani Nikula Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_workarounds.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index 0b80fde927899..be3688908f0ce 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -1061,10 +1061,25 @@ static void glk_whitelist_build(struct intel_engine_cs *engine) static void cfl_whitelist_build(struct intel_engine_cs *engine) { + struct i915_wa_list *w = &engine->whitelist; + if (engine->class != RENDER_CLASS) return; - gen9_whitelist_build(&engine->whitelist); + gen9_whitelist_build(w); + + /* + * WaAllowPMDepthAndInvocationCountAccessFromUMD:cfl,whl,cml,aml + * + * This covers 4 register which are next to one another : + * - PS_INVOCATION_COUNT + * - PS_INVOCATION_COUNT_UDW + * - PS_DEPTH_COUNT + * - PS_DEPTH_COUNT_UDW + */ + whitelist_reg_ext(w, PS_INVOCATION_COUNT, + RING_FORCE_TO_NONPRIV_RD | + RING_FORCE_TO_NONPRIV_RANGE_4); } static void cnl_whitelist_build(struct intel_engine_cs *engine) -- 2.20.1