Module: Mesa Branch: staging/20.1 Commit: 948eb32f4a5f953ae642684e42da70c4181b0b44 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=948eb32f4a5f953ae642684e42da70c4181b0b44
Author: Lionel Landwerlin <[email protected]> Date: Fri Jul 10 10:46:53 2020 +0300 iris: fix fallback to swrast driver The helper we use to query the kernel returns -1 if the getparam is not supported. Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: f402b7c57641dd ("iris: fail screen creation when kernel support is not there") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3188 Reviewed-by: Marcin Ślusarz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5838> (cherry picked from commit e3ddba73241901a75844b39e6e3b12eaf15f9b26) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8ee1ef0b319..d0972fa109c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -130,7 +130,7 @@ "description": "iris: fix fallback to swrast driver", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "f402b7c57641dd2ab4d39032574294c03d75b595" }, diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index c90980fd8b5..154edec41e0 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -648,7 +648,7 @@ iris_screen_create(int fd, const struct pipe_screen_config *config) * * Checking the last feature availability will include all previous ones. */ - if (!iris_getparam_integer(fd, I915_PARAM_HAS_CONTEXT_ISOLATION)) { + if (iris_getparam_integer(fd, I915_PARAM_HAS_CONTEXT_ISOLATION) <= 0) { debug_error("Kernel is too old for Iris. Consider upgrading to kernel v4.16.\n"); return NULL; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
