From 3e0e86f720d5565627c8ca3affb7870f9f47be52 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Wed, 24 May 2023 11:50:21 +0200
Subject: [PATCH] mesa: remove 'printf' from 'iris_bufmgr_tmp.patch'

also rename it to 'iris_bufmgr_fd.patch'

issue #4916
---
 repos/libports/ports/mesa.hash                   |  2 +-
 repos/libports/ports/mesa.port                   |  2 +-
 ...ris_bufmgr_tmp.patch => iris_bufmgr_fd.patch} | 16 ++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename repos/libports/src/lib/mesa/patches/{iris_bufmgr_tmp.patch => iris_bufmgr_fd.patch} (74%)

diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash
index cd073a50d5..58ba2745e9 100644
--- a/repos/libports/ports/mesa.hash
+++ b/repos/libports/ports/mesa.hash
@@ -1 +1 @@
-a5a32fe6f44a46ff1eed62bf585a2b445b939e44
+1649d7b8ab01368078d4eb494e2bdecf7aa15b53
diff --git a/repos/libports/ports/mesa.port b/repos/libports/ports/mesa.port
index 4749b492ac..894d053999 100644
--- a/repos/libports/ports/mesa.port
+++ b/repos/libports/ports/mesa.port
@@ -16,7 +16,7 @@ HASH_INPUT    += $(REP_DIR)/src/lib/mesa/files.list
 PATCHES       := src/lib/mesa/patches/bitset_redefined.patch \
                  src/lib/mesa/patches/etnaviv.patch \
                  src/lib/mesa/patches/iris.patch \
-                 src/lib/mesa/patches/iris_bufmgr_tmp.patch \
+                 src/lib/mesa/patches/iris_bufmgr_fd.patch \
                  src/lib/mesa/patches/iris_bufmgr_unmap.patch \
                  src/lib/mesa/patches/iris_disable_compute.patch \
                  src/lib/mesa/patches/lseek.patch \
diff --git a/repos/libports/src/lib/mesa/patches/iris_bufmgr_tmp.patch b/repos/libports/src/lib/mesa/patches/iris_bufmgr_fd.patch
similarity index 74%
rename from repos/libports/src/lib/mesa/patches/iris_bufmgr_tmp.patch
rename to repos/libports/src/lib/mesa/patches/iris_bufmgr_fd.patch
index bb8901c263..b2c4546306 100644
--- a/repos/libports/src/lib/mesa/patches/iris_bufmgr_tmp.patch
+++ b/repos/libports/src/lib/mesa/patches/iris_bufmgr_fd.patch
@@ -1,6 +1,8 @@
+diff --git a/src/lib/mesa/src/gallium/drivers/iris/iris_bufmgr.c b/src/lib/mesa/src/gallium/drivers/iris/iris_bufmgr.c
+index 3928f57..1849e33 100644
 --- a/src/lib/mesa/src/gallium/drivers/iris/iris_bufmgr.c
 +++ b/src/lib/mesa/src/gallium/drivers/iris/iris_bufmgr.c
-@@ -1297,6 +1297,8 @@
+@@ -1302,6 +1302,8 @@ iris_bo_wait(struct iris_bo *bo, int64_t timeout_ns)
     return ret;
  }
  
@@ -9,26 +11,20 @@
  static void
  iris_bufmgr_destroy(struct iris_bufmgr *bufmgr)
  {
-@@ -1814,10 +1816,13 @@
+@@ -1819,7 +1821,8 @@ gem_param(int fd, int name)
  static struct iris_bufmgr *
  iris_bufmgr_create(struct gen_device_info *devinfo, int fd, bool bo_reuse)
  {
 -   uint64_t gtt_size = iris_gtt_size(fd);
-+printf("%s:%u\n", __func__, __LINE__);
 +//   uint64_t gtt_size = iris_gtt_size(fd);
 +   uint64_t gtt_size = 2 * IRIS_MEMZONE_OTHER_START;
     if (gtt_size <= IRIS_MEMZONE_OTHER_START)
        return NULL;
  
-+printf("%s:%u\n", __func__, __LINE__);
-    struct iris_bufmgr *bufmgr = calloc(1, sizeof(*bufmgr));
-    if (bufmgr == NULL)
-       return NULL;
-@@ -1920,14 +1925,18 @@
+@@ -1925,14 +1928,17 @@ iris_bufmgr_unref(struct iris_bufmgr *bufmgr)
  struct iris_bufmgr *
  iris_bufmgr_get_for_fd(struct gen_device_info *devinfo, int fd, bool bo_reuse)
  {
-+printf("%s:%u\n", __func__, __LINE__);
 +#if 0
     struct stat st;
  
@@ -43,7 +39,7 @@
     list_for_each_entry(struct iris_bufmgr, iter_bufmgr, &global_bufmgr_list, link) {
        struct stat iter_st;
        if (fstat(iter_bufmgr->fd, &iter_st))
-@@ -1939,7 +1948,13 @@
+@@ -1944,7 +1950,13 @@ iris_bufmgr_get_for_fd(struct gen_device_info *devinfo, int fd, bool bo_reuse)
           goto unlock;
        }
     }