mesa: remove 'printf' from 'iris_bufmgr_tmp.patch'

also rename it to 'iris_bufmgr_fd.patch'

issue #4916
This commit is contained in:
Sebastian Sumpf 2023-05-24 11:50:21 +02:00 committed by Norman Feske
parent e3c2fdf414
commit 3e0e86f720
3 changed files with 8 additions and 12 deletions

View File

@ -1 +1 @@
a5a32fe6f44a46ff1eed62bf585a2b445b939e44
1649d7b8ab01368078d4eb494e2bdecf7aa15b53

View File

@ -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 \

View File

@ -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;
}
}