xf86-video-intel: src/sna/kgem.c

Chris Wilson ickle at kemper.freedesktop.org
Sun Apr 12 09:55:29 PDT 2015


 src/sna/kgem.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f74121e222b025ad8d8180850541740f76575f17
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Apr 12 17:54:49 2015 +0100

    sna: Set addr for the 64bit self-relocation
    
    Copy-paste fail.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index b217c19..b6cae24 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1468,6 +1468,8 @@ static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
 					     kgem->reloc[n].delta - shrink));
 					kgem->reloc[n].delta -= shrink;
 				}
+
+				addr = (int)kgem->reloc[n].delta + bo->presumed_offset;
 				kgem->batch[kgem->reloc[n].offset/sizeof(uint32_t)] = addr;
 				if (kgem->gen >= 0100)
 					kgem->batch[kgem->reloc[n].offset/sizeof(uint32_t) + 1] = addr >> 32;


More information about the xorg-commit mailing list