KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: Do not call to pipe_loader_sw_probe_kms when not present 

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>
This commit is contained in:
Yonggang Luo 2022-07-28 13:54:55 +08:00 committed by Marge Bot
parent 34572042c7
commit 98fa0c3351
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/pipe-loader/pipe_loader.h
View File

@ -157,6 +157,7 @@ bool
pipe_loader_vk_probe_dri(struct pipe_loader_device **devs, pipe_loader_vk_probe_dri(struct pipe_loader_device **devs,
const struct drisw_loader_funcs *drisw_lf); const struct drisw_loader_funcs *drisw_lf);
#ifdef HAVE_PIPE_LOADER_KMS
/** /**
* Initialize a kms backed sw device given an fd. * Initialize a kms backed sw device given an fd.
* *
@ -169,6 +170,7 @@ pipe_loader_vk_probe_dri(struct pipe_loader_device **devs,
*/ */
bool bool
pipe_loader_sw_probe_kms(struct pipe_loader_device **devs, int fd); pipe_loader_sw_probe_kms(struct pipe_loader_device **devs, int fd);
#endif
/** /**
* Initialize a null sw device. * Initialize a null sw device.

2
src/gallium/frontends/dri/dri2.c
View File

@ -2528,10 +2528,12 @@ dri_swrast_kms_init_screen(__DRIscreen * sPriv)
sPriv->driverPrivate = (void *)screen; sPriv->driverPrivate = (void *)screen;
#ifdef HAVE_PIPE_LOADER_KMS
if (pipe_loader_sw_probe_kms(&screen->dev, screen->fd)) { if (pipe_loader_sw_probe_kms(&screen->dev, screen->fd)) {
pscreen = pipe_loader_create_screen(screen->dev); pscreen = pipe_loader_create_screen(screen->dev);
dri_init_options(screen); dri_init_options(screen);
} }
#endif
if (!pscreen) if (!pscreen)
goto release_pipe; goto release_pipe;

2
src/gallium/frontends/dri/drisw.c
View File

@ -538,8 +538,10 @@ drisw_init_screen(__DRIscreen * sPriv)
} }
bool success = false; bool success = false;
#ifdef HAVE_PIPE_LOADER_KMS
if (screen->fd != -1) if (screen->fd != -1)
success = pipe_loader_sw_probe_kms(&screen->dev, screen->fd); success = pipe_loader_sw_probe_kms(&screen->dev, screen->fd);
#endif
if (!success) if (!success)
success = pipe_loader_sw_probe_dri(&screen->dev, lf); success = pipe_loader_sw_probe_dri(&screen->dev, lf);
if (success) { if (success) {