Module: Mesa Branch: main Commit: 5cc9569b5b9d8e5c696c70af3cc79f13184a5474 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cc9569b5b9d8e5c696c70af3cc79f13184a5474
Author: José Roberto de Souza <[email protected]> Date: Tue Jul 4 07:25:49 2023 -0700 iris: Convert slab address to canonical This was the only missing case of bo->address that could possibly not formated as canonical. Signed-off-by: José Roberto de Souza <[email protected]> Reviewed-by: Sagar Ghuge <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23994> --- src/gallium/drivers/iris/iris_bufmgr.c | 2 +- src/gallium/drivers/iris/iris_bufmgr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index f2c3aa1f85a..f1f58861e0f 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -828,7 +828,7 @@ iris_slab_alloc(void *priv, bo->bufmgr = bufmgr; bo->hash = _mesa_hash_pointer(bo); bo->gem_handle = 0; - bo->address = slab->bo->address + i * entry_size; + bo->address = intel_canonical_address(slab->bo->address + i * entry_size); bo->aux_map_address = 0; bo->index = -1; bo->refcount = 0; diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h index 18d17595fdc..5ba8c69f26b 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.h +++ b/src/gallium/drivers/iris/iris_bufmgr.h @@ -190,7 +190,7 @@ struct iris_bo { uint32_t gem_handle; /** - * Virtual address of the buffer inside the PPGTT (Per-Process Graphics + * Canonical virtual address of the buffer inside the PPGTT (Per-Process Graphics * Translation Table). * * Although each hardware context has its own VMA, we assign BO's to the
