From 49465f1330f2c7bc43815ca935cbacc81cd97ff5 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Wed, 24 Jul 2019 15:21:36 -0700 Subject: [PATCH] iris/screen: use initialization routine for gen_device_info Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin --- src/gallium/drivers/iris/iris_screen.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index ceacae239a0..9aea9e963c2 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -616,17 +616,15 @@ iris_screen_create(int fd, const struct pipe_screen_config *config) return NULL; screen->fd = fd; - screen->pci_id = iris_getparam_integer(screen, I915_PARAM_CHIPSET_ID); - if (!gen_get_device_info(screen->pci_id, &screen->devinfo)) + if (!gen_get_device_info_from_fd(fd, &screen->devinfo)) return NULL; + screen->pci_id = screen->devinfo.chipset_id; + screen->no_hw = screen->devinfo.no_hw; if (screen->devinfo.gen < 8 || screen->devinfo.is_cherryview) return NULL; - screen->devinfo.timestamp_frequency = - iris_getparam_integer(screen, I915_PARAM_CS_TIMESTAMP_FREQUENCY); - screen->aperture_bytes = get_aperture_size(fd); if (getenv("INTEL_NO_HW") != NULL) -- 2.30.2