OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Drop extra file-descriptor dup in iris_drm_screen_create()

Browse Source 
In a99e85db9e, we added a dup into iris_screen_create(). Apparently
some android code paths must be hitting iris_screen_create() without
calling iris_drm_screen_create(). After a99e85db9e, the code paths
that do hit iris_drm_screen_create() will now dup the fd twice, but
iris_screen_destroy() will only close 1 of these fds.

Fixes: a99e85db9e ("iris:Duplicate DRM fd internally instead of reuse.")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18020>
This commit is contained in:
Jordan Justen
2022-08-11 01:47:09 -07:00
committed by Marge Bot
parent 3c78e94ff3
commit e9f40e42de
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/winsys/iris/drm/iris_drm_winsys.c
View File

@@ -32,8 +32,5 @@ extern struct pipe_screen *iris_screen_create(int fd, const struct pipe_screen_c
struct pipe_screen *
iris_drm_screen_create(int fd, const struct pipe_screen_config *config)
{
int newfd = os_dupfd_cloexec(fd);
if (newfd < 0)
return NULL;
return iris_screen_create(newfd, config);
return iris_screen_create(fd, config);
}