fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/dri: NULL check the pscreen earlier

Browse source 
We delay the null check only to jump through hoops to work around that.
Check early to make our lives easier.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Emil Velikov 2015-10-15 00:46:26 +01:00
parent 13bccee87d
commit e43a771dfa
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/state_trackers/dri/dri2.c
View file

@ -1444,8 +1444,8 @@ dri2_init_screen(__DRIscreen * sPriv)
const __DRIconfig **configs;
struct dri_screen *screen;
struct pipe_screen *pscreen = NULL;
const struct drm_conf_ret *throttle_ret = NULL;
const struct drm_conf_ret *dmabuf_ret = NULL;
const struct drm_conf_ret *throttle_ret;
const struct drm_conf_ret *dmabuf_ret;
screen = CALLOC_STRUCT(dri_screen);
if (!screen)
@ -1457,12 +1457,14 @@ dri2_init_screen(__DRIscreen * sPriv)
sPriv->driverPrivate = (void *)screen;
if (pipe_loader_drm_probe_fd(&screen->dev, dup(screen->fd))) {
if (pipe_loader_drm_probe_fd(&screen->dev, dup(screen->fd)))
pscreen = pipe_loader_create_screen(screen->dev);
throttle_ret = pipe_loader_configuration(screen->dev, DRM_CONF_THROTTLE);
dmabuf_ret = pipe_loader_configuration(screen->dev, DRM_CONF_SHARE_FD);
}
if (!pscreen)
goto fail;
throttle_ret = pipe_loader_configuration(screen->dev, DRM_CONF_THROTTLE);
dmabuf_ret = pipe_loader_configuration(screen->dev, DRM_CONF_SHARE_FD);
if (throttle_ret && throttle_ret->val.val_int != -1) {
screen->throttling_enabled = TRUE;
@ -1479,15 +1481,13 @@ dri2_init_screen(__DRIscreen * sPriv)
}
}
if (pscreen && pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
sPriv->extensions = dri_robust_screen_extensions;
screen->has_reset_status_query = true;
}
else
sPriv->extensions = dri_screen_extensions;
/* dri_init_screen_helper checks pscreen for us */
configs = dri_init_screen_helper(screen, pscreen, screen->dev->driver_name);
if (!configs)
goto fail;
@ -1532,6 +1532,9 @@ dri_kms_init_screen(__DRIscreen * sPriv)
if (pipe_loader_sw_probe_kms(&screen->dev, dup(screen->fd)))
pscreen = pipe_loader_create_screen(screen->dev);
if (!pscreen)
goto fail;
if (drmGetCap(sPriv->fd, DRM_CAP_PRIME, &cap) == 0 &&
(cap & DRM_PRIME_CAP_IMPORT)) {
dri2ImageExtension.createImageFromFds = dri2_from_fds;
@ -1540,7 +1543,6 @@ dri_kms_init_screen(__DRIscreen * sPriv)
sPriv->extensions = dri_screen_extensions;
/* dri_init_screen_helper checks pscreen for us */
configs = dri_init_screen_helper(screen, pscreen, "swrast");
if (!configs)
goto fail;

5
src/gallium/state_trackers/dri/dri_screen.c
View file

@ -414,11 +414,6 @@ dri_init_screen_helper(struct dri_screen *screen,
const char* driver_name)
{
screen->base.screen = pscreen;
if (!screen->base.screen) {
debug_printf("%s: failed to create pipe_screen\n", __FUNCTION__);
return NULL;
}
screen->base.get_egl_image = dri_get_egl_image;
screen->base.get_param = dri_get_param;

3
src/gallium/state_trackers/dri/drisw.c
View file

@ -400,7 +400,8 @@ drisw_init_screen(__DRIscreen * sPriv)
if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf))
pscreen = pipe_loader_create_screen(screen->dev);
/* dri_init_screen_helper checks pscreen for us */
if (!pscreen)
goto fail;
configs = dri_init_screen_helper(screen, pscreen, "swrast");
if (!configs)