From a2ae888929bd0e36b3bdf8d789853440b5a23097 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 27 Jun 2016 11:50:17 -0700 Subject: [PATCH] i965: Use intel_get_param() more often Replace some open-coded ioctls with intel_get_param(). This is just a cleanup. No change in behavior. Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/intel_screen.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index b693c45..f724a56 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1605,12 +1605,10 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) (ret != -1 || errno != EINVAL); } - struct drm_i915_getparam getparam; - getparam.param = I915_PARAM_CMD_PARSER_VERSION; - getparam.value = &intelScreen->cmd_parser_version; - const int ret = drmIoctl(psp->fd, DRM_IOCTL_I915_GETPARAM, &getparam); - if (ret == -1) + if (intel_get_param(intelScreen, I915_PARAM_CMD_PARSER_VERSION, + &intelScreen->cmd_parser_version) < 0) { intelScreen->cmd_parser_version = 0; + } /* Haswell requires command parser version 6 in order to write to the * MI_MATH GPR registers, and version 7 in order to use @@ -1630,12 +1628,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) intelScreen->program_id = 1; if (intelScreen->devinfo->has_resource_streamer) { - int val = -1; - getparam.param = I915_PARAM_HAS_RESOURCE_STREAMER; - getparam.value = &val; - - drmIoctl(psp->fd, DRM_IOCTL_I915_GETPARAM, &getparam); - intelScreen->has_resource_streamer = val > 0; + intelScreen->has_resource_streamer = + intel_get_boolean(intelScreen, I915_PARAM_HAS_RESOURCE_STREAMER); } return (const __DRIconfig**) intel_screen_make_configs(psp); -- 2.7.4