From 23adf60f96fd81a4c90703fd083431339b190006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 2 Nov 2022 06:33:43 -0700 Subject: [PATCH] iris: Get VM id from iris_bufmgr's fd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit iris_bufmgr_init_global_vm() was getting the VM id from the callers fd not the iris_bufmgr's duplicated fd. If i915 driver decides to always return unique vm ids, like a counter that is initialized per device. So fd0 would have vm id = 0 by default, fd1(dup of fd0) would have vm id = 1... in this scenario it would cause a mismatch. But it is not the current i915 implementation. Signed-off-by: José Roberto de Souza Reviewed-by: Paulo Zanoni Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 801e0f5e9ff..b472734225e 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -2356,10 +2356,10 @@ iris_bufmgr_get_meminfo(struct iris_bufmgr *bufmgr, } static void -iris_bufmgr_init_global_vm(int fd, struct iris_bufmgr *bufmgr) +iris_bufmgr_init_global_vm(struct iris_bufmgr *bufmgr) { uint64_t value; - if (!intel_gem_get_context_param(fd, 0, I915_CONTEXT_PARAM_VM, &value)) { + if (!intel_gem_get_context_param(bufmgr->fd, 0, I915_CONTEXT_PARAM_VM, &value)) { bufmgr->use_global_vm = false; bufmgr->global_vm_id = 0; } else { @@ -2400,7 +2400,7 @@ iris_bufmgr_create(struct intel_device_info *devinfo, int fd, bool bo_reuse) simple_mtx_init(&bufmgr->lock, mtx_plain); simple_mtx_init(&bufmgr->bo_deps_lock, mtx_plain); - iris_bufmgr_init_global_vm(fd, bufmgr); + iris_bufmgr_init_global_vm(bufmgr); list_inithead(&bufmgr->zombie_list);