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

iris: fail screen creation when kernel support is not there

Browse source 
v2: Bump check to I915_PARAM_HAS_CONTEXT_ISOLATION (v4.16) (Ken)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2803
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4643>
This commit is contained in:
Lionel Landwerlin 2020-04-20 17:09:42 +03:00 • committed by Marge Bot
parent bca97abffa
commit f402b7c576
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/iris/iris_screen.c
View file

@ -565,22 +565,22 @@ iris_get_disk_shader_cache(struct pipe_screen *pscreen)
} }
static int static int
iris_getparam(struct iris_screen *screen, int param, int *value) iris_getparam(int fd, int param, int *value)
{ {
struct drm_i915_getparam gp = { .param = param, .value = value }; struct drm_i915_getparam gp = { .param = param, .value = value };
if (ioctl(screen->fd, DRM_IOCTL_I915_GETPARAM, &gp) == -1) if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) == -1)
return -errno; return -errno;
return 0; return 0;
} }
static int static int
iris_getparam_integer(struct iris_screen *screen, int param) iris_getparam_integer(int fd, int param)
{ {
int value = -1; int value = -1;
if (iris_getparam(screen, param, &value) == 0) if (iris_getparam(fd, param, &value) == 0)
return value; return value;
return -1; return -1;
@ -637,6 +637,20 @@ iris_shader_perf_log(void *data, const char *fmt, ...)
struct pipe_screen * struct pipe_screen *
iris_screen_create(int fd, const struct pipe_screen_config *config) iris_screen_create(int fd, const struct pipe_screen_config *config)
{ {
/* Here are the i915 features we need for Iris (in chronoligical order) :
* - I915_PARAM_HAS_EXEC_NO_RELOC (3.10)
* - I915_PARAM_HAS_EXEC_HANDLE_LUT (3.10)
* - I915_PARAM_HAS_EXEC_BATCH_FIRST (4.13)
* - I915_PARAM_HAS_EXEC_FENCE_ARRAY (4.14)
* - I915_PARAM_HAS_CONTEXT_ISOLATION (4.16)
*
* Checking the last feature availability will include all previous ones.
*/
if (!iris_getparam_integer(fd, I915_PARAM_HAS_CONTEXT_ISOLATION)) {
debug_error("Kernel is too old for Iris. Consider upgrading to kernel v4.16.\n");
return NULL;
}
struct iris_screen *screen = rzalloc(NULL, struct iris_screen); struct iris_screen *screen = rzalloc(NULL, struct iris_screen);
if (!screen) if (!screen)
return NULL; return NULL;
@ -706,7 +720,7 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
sizeof(struct iris_transfer), 64); sizeof(struct iris_transfer), 64);
screen->subslice_total = screen->subslice_total =
iris_getparam_integer(screen, I915_PARAM_SUBSLICE_TOTAL); iris_getparam_integer(screen->fd, I915_PARAM_SUBSLICE_TOTAL);
assert(screen->subslice_total >= 1); assert(screen->subslice_total >= 1);
struct pipe_screen *pscreen = &screen->base; struct pipe_screen *pscreen = &screen->base;