Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [igt-dev] [PATCH i-g-t] lib/intel_batchbuffer: Fix relocs across the 4GB address boundary
Date: Mon,  9 Nov 2020 14:06:32 +0200	[thread overview]
Message-ID: <20201109120632.389212-2-imre.deak@intel.com> (raw)
In-Reply-To: <20201109120632.389212-1-imre.deak@intel.com>

If the delta of a relocation target wrt. the object base address crosses
the 4GB address boundary the upper 32bit of the target address will be
incorrect, fix this.

Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 lib/intel_batchbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index fc73495c0..7b4cfb0dd 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -1850,7 +1850,7 @@ static uint64_t __intel_bb_emit_reloc(struct intel_bb *ibb,
 
 	intel_bb_out(ibb, delta + address);
 	if (ibb->gen >= 8)
-		intel_bb_out(ibb, address >> 32);
+		intel_bb_out(ibb, (delta + address) >> 32);
 
 	return address;
 }
-- 
2.25.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  reply	other threads:[~2020-11-09 12:06 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 12:06 [igt-dev] [PATCH i-g-t] lib/intel_batchbuffer: Fix relocs across the 4GB address boundary Imre Deak
2020-11-09 12:06 ` Imre Deak [this message]
2020-11-09 12:08   ` Chris Wilson
2020-11-09 13:02     ` Zbigniew Kempczyński
2020-11-09 13:05       ` Chris Wilson
2020-11-09 13:06         ` Chris Wilson
2020-11-09 13:12         ` Imre Deak
2020-11-09 13:34 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/intel_batchbuffer: Fix relocs across the 4GB address boundary (rev2) Patchwork
2020-11-09 15:04 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-09 15:26   ` Imre Deak
2020-11-09 17:26     ` Vudum, Lakshminarayana
2020-11-09 17:11 ` Patchwork
2020-11-09 17:17 ` [igt-dev] [PATCH i-g-t] lib/intel_batchbuffer: Fix relocs across the 4GB address boundary Zbigniew Kempczyński
2020-11-09 17:23 ` [igt-dev] ✓ Fi.CI.IGT: success for lib/intel_batchbuffer: Fix relocs across the 4GB address boundary (rev2) 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=20201109120632.389212-2-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=igt-dev@lists.freedesktop.org \
    /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