From 1aeb7075715155ce907a59ab7a27308ac1469747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Tue, 16 Jul 2024 14:13:34 -0700 Subject: [PATCH] isl: Fix Xe2 protected mask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BSpec 71045 and 57023 still points that protected/encrypted bit is still bit 0, bit 1 should not be set or undesired MOCS index could be set. Fixes: 7be8bc2c971b ("isl: Add mocs for xe2") Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: (cherry picked from commit 79f95a371110eb83f45c4d1715b732a50da7d156) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 26dfff7e050..0df970f40ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -534,7 +534,7 @@ "description": "isl: Fix Xe2 protected mask", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7be8bc2c971bd40101f1ac537d7cf518ed648179", "notes": null diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index f1b04aaa3ab..cc66028e6f0 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -113,7 +113,7 @@ isl_device_setup_mocs(struct isl_device *dev) /* L3+L4=WB; BSpec: 71582 */ dev->mocs.internal = 1 << 1; dev->mocs.external = 1 << 1; - dev->mocs.protected_mask = 3 << 0; + dev->mocs.protected_mask = 1 << 0; /* TODO: Setting to uncached * WA 14018443005: * Ensure that any compression-enabled resource from gfx memory subject