From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 22/23] drm/i915: Add whitelist workarounds for ICL Date: Tue, 3 Sep 2019 12:24:23 -0400 Message-ID: <20190903162424.6877-22-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 YW0gY29tbWl0IDdiM2Q0MDYzMTA5ODNhODllZDdhMWVjZGQxMTVlZmJlMTJiMGRlZDUgXQoKVXBk YXRlZCB3aGl0ZWxpc3QgdGFibGUgZm9yIElDTC4KCnYyOiBSZWR1Y2UgY2hhbmdlcyB0byBqdXN0 IHRob3NlIHJlcXVpcmVkIGZvciBtZWRpYSBkcml2ZXIgdW50aWwKdGhlIHNlbGZ0ZXN0IGNhbiBi ZSB1cGRhdGVkIHRvIHN1cHBvcnQgdGhlIG5ldyBmZWF0dXJlcyBvZiB0aGUKb3RoZXIgZW50cmll cy4KClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IFJvYmVydCBNLiBGb3NoYSA8cm9iZXJ0Lm0uZm9zaGFAaW50ZWwu Y29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KTGluazogaHR0cHM6Ly9wYXRjaHdv cmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTkwNjE4MDEwMTA4LjI3NDk5LTQtSm9o bi5DLkhhcnJpc29uQEludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFs QGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMu YyB8IDM4ICsrKysrKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI3IGluc2Vy dGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3Jr YXJvdW5kcy5jCmluZGV4IGJlMzY4ODkwOGYwY2UuLmVmZWE1YTE4ZmE2ZGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtMTA5NywxNyArMTA5NywzMyBAQCBz dGF0aWMgdm9pZCBpY2xfd2hpdGVsaXN0X2J1aWxkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIHsKIAlzdHJ1Y3QgaTkxNV93YV9saXN0ICp3ID0gJmVuZ2luZS0+d2hpdGVsaXN0Owog Ci0JaWYgKGVuZ2luZS0+Y2xhc3MgIT0gUkVOREVSX0NMQVNTKQotCQlyZXR1cm47Ci0KLQkvKiBX YUFsbG93VU1EVG9Nb2RpZnlIYWxmU2xpY2VDaGlja2VuNzppY2wgKi8KLQl3aGl0ZWxpc3RfcmVn KHcsIEdFTjlfSEFMRl9TTElDRV9DSElDS0VONyk7Ci0KLQkvKiBXYUFsbG93VU1EVG9Nb2RpZnlT YW1wbGVyTW9kZTppY2wgKi8KLQl3aGl0ZWxpc3RfcmVnKHcsIEdFTjEwX1NBTVBMRVJfTU9ERSk7 Ci0KLQkvKiBXYUVuYWJsZVN0YXRlQ2FjaGVSZWRpcmVjdFRvQ1M6aWNsICovCi0Jd2hpdGVsaXN0 X3JlZyh3LCBHRU45X1NMSUNFX0NPTU1PTl9FQ09fQ0hJQ0tFTjEpOworCXN3aXRjaCAoZW5naW5l LT5jbGFzcykgeworCWNhc2UgUkVOREVSX0NMQVNTOgorCQkvKiBXYUFsbG93VU1EVG9Nb2RpZnlI YWxmU2xpY2VDaGlja2VuNzppY2wgKi8KKwkJd2hpdGVsaXN0X3JlZyh3LCBHRU45X0hBTEZfU0xJ Q0VfQ0hJQ0tFTjcpOworCisJCS8qIFdhQWxsb3dVTURUb01vZGlmeVNhbXBsZXJNb2RlOmljbCAq LworCQl3aGl0ZWxpc3RfcmVnKHcsIEdFTjEwX1NBTVBMRVJfTU9ERSk7CisKKwkJLyogV2FFbmFi bGVTdGF0ZUNhY2hlUmVkaXJlY3RUb0NTOmljbCAqLworCQl3aGl0ZWxpc3RfcmVnKHcsIEdFTjlf U0xJQ0VfQ09NTU9OX0VDT19DSElDS0VOMSk7CisJCWJyZWFrOworCisJY2FzZSBWSURFT19ERUNP REVfQ0xBU1M6CisJCS8qIGh1Y1N0YXR1c1JlZ09mZnNldCAqLworCQl3aGl0ZWxpc3RfcmVnX2V4 dCh3LCBfTU1JTygweDIwMDAgKyBlbmdpbmUtPm1taW9fYmFzZSksCisJCQkJICBSSU5HX0ZPUkNF X1RPX05PTlBSSVZfUkQpOworCQkvKiBodWNVS2VybmVsSGRySW5mb1JlZ09mZnNldCAqLworCQl3 aGl0ZWxpc3RfcmVnX2V4dCh3LCBfTU1JTygweDIwMTQgKyBlbmdpbmUtPm1taW9fYmFzZSksCisJ CQkJICBSSU5HX0ZPUkNFX1RPX05PTlBSSVZfUkQpOworCQkvKiBodWNTdGF0dXMyUmVnT2Zmc2V0 ICovCisJCXdoaXRlbGlzdF9yZWdfZXh0KHcsIF9NTUlPKDB4MjNCMCArIGVuZ2luZS0+bW1pb19i YXNlKSwKKwkJCQkgIFJJTkdfRk9SQ0VfVE9fTk9OUFJJVl9SRCk7CisJCWJyZWFrOworCisJZGVm YXVsdDoKKwkJYnJlYWs7CisJfQogfQogCiB2b2lkIGludGVsX2VuZ2luZV9pbml0X3doaXRlbGlz dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCi0tIAoyLjIwLjEKCl9fX19fX19fX19f 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=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 8803EC3A5A2 for ; Tue, 3 Sep 2019 16:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55A9B2377F for ; Tue, 3 Sep 2019 16:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527925; bh=24HeKgZc0EdrCzr8e/aVIGvdzcTwEfQ6sZ6O29G15NY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tgLbE8OqOjwADhXzg9PnLOmr8TpNzOWOmPiCuj6/bKstzUFudzt3K6+hGT2WYF1zb BbYdxMK5lawxUziJ1Cdwd0e0DbKf1DOAFNQAVouEpcIMHdKu6PY/XVWwJwpmj6C01F KMw2LxiVrdjSseuPKsVKAN7m/4EVl1nVTfxQlQ5o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730372AbfICQZY (ORCPT ); Tue, 3 Sep 2019 12:25:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:45092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730316AbfICQZO (ORCPT ); Tue, 3 Sep 2019 12:25:14 -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 BB83123711; Tue, 3 Sep 2019 16:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527913; bh=24HeKgZc0EdrCzr8e/aVIGvdzcTwEfQ6sZ6O29G15NY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=00WD3xG1HXVmfZCWpIRI6NgAfgxq9CJbQsZdJoQ2ElVDbFVR29qcqJ0ih4VGnjyHL sDwYBUdplNaVqHypg1Z4G1P5s1hPb9b7KAOo2fNL3b69A9W9YSBK2RkBK9To7U+q0N YKAzlj/q9qlnSU036H8BleVMdwSdt/1dvvepczcw= 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 22/23] drm/i915: Add whitelist workarounds for ICL Date: Tue, 3 Sep 2019 12:24:23 -0400 Message-Id: <20190903162424.6877-22-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 7b3d406310983a89ed7a1ecdd115efbe12b0ded5 ] Updated whitelist table for ICL. v2: Reduce changes to just those required for media driver until the selftest can be updated to support the new features of the other entries. 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-4-John.C.Harrison@Intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_workarounds.c | 38 +++++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index be3688908f0ce..efea5a18fa6db 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -1097,17 +1097,33 @@ 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); - - /* WaAllowUMDToModifySamplerMode:icl */ - whitelist_reg(w, GEN10_SAMPLER_MODE); - - /* WaEnableStateCacheRedirectToCS:icl */ - whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1); + switch (engine->class) { + case RENDER_CLASS: + /* WaAllowUMDToModifyHalfSliceChicken7:icl */ + whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7); + + /* WaAllowUMDToModifySamplerMode:icl */ + whitelist_reg(w, GEN10_SAMPLER_MODE); + + /* WaEnableStateCacheRedirectToCS:icl */ + whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1); + break; + + case VIDEO_DECODE_CLASS: + /* hucStatusRegOffset */ + whitelist_reg_ext(w, _MMIO(0x2000 + engine->mmio_base), + RING_FORCE_TO_NONPRIV_RD); + /* hucUKernelHdrInfoRegOffset */ + whitelist_reg_ext(w, _MMIO(0x2014 + engine->mmio_base), + RING_FORCE_TO_NONPRIV_RD); + /* hucStatus2RegOffset */ + whitelist_reg_ext(w, _MMIO(0x23B0 + engine->mmio_base), + RING_FORCE_TO_NONPRIV_RD); + break; + + default: + break; + } } void intel_engine_init_whitelist(struct intel_engine_cs *engine) -- 2.20.1