From: Andi Shyti <andi.shyti@linux.intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>,
DRI Devel <dri-devel@lists.freedesktop.org>,
Fei Yang <fei.yang@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
Lucas Martins De Marchi <lucas.demarchi@intel.com>,
Andi Shyti <andi.shyti@kernel.org>,
Matt Roper <matthew.d.roper@intel.com>,
Nirmoy Das <nirmoy.das@intel.com>
Subject: [Intel-gfx] [PATCH 1/2] Revert "drm/i915/mtl: fix mocs selftest"
Date: Mon, 24 Apr 2023 18:09:12 +0200 [thread overview]
Message-ID: <20230424160913.19886-2-andi.shyti@linux.intel.com> (raw)
In-Reply-To: <20230424160913.19886-1-andi.shyti@linux.intel.com>
This reverts commit faca6aaa4838c3c234caa619d3c7d1f09da0d303.
This patch, in series with the next "Define MOCS and PAT tables
for MTL" are causing boot failures for MTL.
Revert them both.
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Fei Yang <fei.yang@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/i915/gt/selftest_mocs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/selftest_mocs.c b/drivers/gpu/drm/i915/gt/selftest_mocs.c
index a8446ab825012..ca009a6a13bdb 100644
--- a/drivers/gpu/drm/i915/gt/selftest_mocs.c
+++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c
@@ -131,14 +131,13 @@ static int read_mocs_table(struct i915_request *rq,
const struct drm_i915_mocs_table *table,
u32 *offset)
{
- struct intel_gt *gt = rq->engine->gt;
u32 addr;
if (!table)
return 0;
if (HAS_GLOBAL_MOCS_REGISTERS(rq->engine->i915))
- addr = global_mocs_offset() + gt->uncore->gsi_offset;
+ addr = global_mocs_offset();
else
addr = mocs_offset(rq->engine);
--
2.40.0
next prev parent reply other threads:[~2023-04-24 16:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 16:09 [Intel-gfx] [PATCH 0/2] Restore MTL boot Andi Shyti
2023-04-24 16:09 ` Andi Shyti [this message]
2023-04-25 6:25 ` [Intel-gfx] [PATCH 1/2] Revert "drm/i915/mtl: fix mocs selftest" Andrzej Hajda
2023-04-24 16:09 ` [Intel-gfx] [PATCH 2/2] Revert "drm/i915/mtl: Define MOCS and PAT tables for MTL" Andi Shyti
2023-04-25 6:25 ` Andrzej Hajda
2023-04-24 16:16 ` [Intel-gfx] [PATCH 0/2] Restore MTL boot Das, Nirmoy
2023-04-24 23:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Restore MTL boot (rev2) Patchwork
2023-04-25 0:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-04-25 6:19 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230424160913.19886-2-andi.shyti@linux.intel.com \
--to=andi.shyti@linux.intel.com \
--cc=andi.shyti@kernel.org \
--cc=andrzej.hajda@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fei.yang@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=nirmoy.das@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox