[igt-dev] [PATCH i-g-t v4 3/3] lib: Use i915_get_param where it is applicable

Lukasz Kalamarz
2018-12-04T16:35:10Z

With usage of implemented i915_get_param helper function, we can
remove some duplicated code lines across few libs.

v2: Fix typos and missing include
v3: Drop unnecessary getparam structure in one function
v4: Rebased and used renamed function

Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>

Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Petri Latvala <Petri.latvala@intel.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Ankit K Nautiyal <ankit.k.nautiyal@intel.com>
---
lib/drmtest.c | 13 ++------
lib/i915/gem_scheduler.c | 8 +----
lib/i915/gem_submission.c | 10 +++---
lib/igt_gt.c | 9 ++----
lib/intel_chipset.c | 7 ++---
lib/ioctl_wrappers.c | 66 ++++++---------------------------------
lib/meson.build | 3 +-
7 files changed, 25 insertions(+), 91 deletions(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index d2aa1c19..3006c855 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -107,20 +107,11 @@ bool is_i915_device(int fd)

static bool has_known_intel_chipset(int fd)
{
- struct drm_i915_getparam gp;
int devid = 0;

- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_CHIPSET_ID;
- gp.value = &devid;
+ devid = i915_get_param(fd, I915_PARAM_CHIPSET_ID);

- if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp)))
- return false;
-
- if (!intel_gen(devid))
- return false;
-
- return true;
+ return devid > 0 && intel_gen(devid);
}

#define LOCAL_I915_EXEC_VEBOX (4 << 0)
diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c
index ad156306..7d509393 100644
--- a/lib/i915/gem_scheduler.c
+++ b/lib/i915/gem_scheduler.c
@@ -52,14 +52,8 @@ unsigned gem_scheduler_capability(int fd)
static int caps = -1;

if (caps < 0) {
- struct drm_i915_getparam gp;
-
- memset(&gp, 0, sizeof(gp));
- gp.param = LOCAL_I915_PARAM_HAS_SCHEDULER;
- gp.value = &caps;
-
caps = 0;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ caps = i915_get_param(fd, LOCAL_I915_PARAM_HAS_SCHEDULER);
errno = 0;
}

diff --git a/lib/i915/gem_submission.c b/lib/i915/gem_submission.c
index 2fd460d5..40938667 100644
--- a/lib/i915/gem_submission.c
+++ b/lib/i915/gem_submission.c
@@ -53,12 +53,12 @@
static bool has_semaphores(int fd, int dir)
{
int val = 0;
- struct drm_i915_getparam gp = {
- gp.param = I915_PARAM_HAS_SEMAPHORES,
- gp.value = &val,
- };
- if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) < 0)
+
+ val = i915_get_param(fd, I915_PARAM_HAS_SEMAPHORES);
+
+ if (val < 0)
val = igt_sysfs_get_boolean(dir, "semaphores");
+
return val;
}

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index a2061924..663f41e8 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -57,14 +57,11 @@ static bool has_gpu_reset(int fd)
{
static int once = -1;
if (once < 0) {
- struct drm_i915_getparam gp;
- int val = 0;
+ int val = -1;

- memset(&gp, 0, sizeof(gp));
- gp.param = 35; /* HAS_GPU_RESET */
- gp.value = &val;
+ val = i915_get_param(fd, I915_PARAM_HAS_GPU_RESET);

- if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
+ if (val < 0)
once = intel_gen(intel_get_drm_devid(fd)) >= 5;
else
once = val > 0;
diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
index 4748a3fb..a6a80f58 100644
--- a/lib/intel_chipset.c
+++ b/lib/intel_chipset.c
@@ -41,6 +41,7 @@
#include "drmtest.h"
#include "intel_chipset.h"
#include "igt_core.h"
+#include "ioctl_wrappers.h"

/**
* SECTION:intel_chipset
@@ -125,7 +126,6 @@ intel_get_pci_device(void)
uint32_t
intel_get_drm_devid(int fd)
{
- struct drm_i915_getparam gp;
const char *override;
int devid = 0;

@@ -135,10 +135,7 @@ intel_get_drm_devid(int fd)
if (override)
return strtol(override, NULL, 0);

- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_CHIPSET_ID;
- gp.value = &devid;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ devid = i915_get_param(fd, I915_PARAM_CHIPSET_ID);

return devid;
}
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index b48dad5b..dfe8ba69 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -522,16 +522,12 @@ bool i915_has_feature(int fd, uint32_t param)
bool gem_create__has_stolen_support(int fd)
{
static int has_stolen_support = -1;
- struct drm_i915_getparam gp;
int val = -1;

if (has_stolen_support < 0) {
- memset(&gp, 0, sizeof(gp));
- gp.param = 38; /* CREATE_VERSION */
- gp.value = &val;
+ val = i915_get_param(fd, I915_PARAM_HAS_POOLED_EU);

/* Do we have the extended gem_create_ioctl? */
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
has_stolen_support = val >= 2;
}

@@ -751,21 +747,13 @@ bool gem_mmap__has_wc(int fd)
static int has_wc = -1;

if (has_wc == -1) {
- struct drm_i915_getparam gp;
int mmap_version = -1;
int gtt_version = -1;

has_wc = 0;

- memset(&gp, 0, sizeof(gp));
- gp.param = 40; /* MMAP_GTT_VERSION */
- gp.value = &gtt_version;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
-
- memset(&gp, 0, sizeof(gp));
- gp.param = 30; /* MMAP_VERSION */
- gp.value = &mmap_version;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ gtt_version = i915_get_param(fd, I915_PARAM_MMAP_GTT_VERSION);
+ mmap_version = i915_get_param(fd, I915_PARAM_MMAP_VERSION);

/* Do we have the new mmap_ioctl with DOMAIN_WC? */
if (mmap_version >= 1 && gtt_version >= 2) {
@@ -1010,17 +998,11 @@ bool gem_bo_busy(int fd, uint32_t handle)
*/
static int gem_gtt_type(int fd)
{
- struct drm_i915_getparam gp;
int val = 0;

- memset(&gp, 0, sizeof(gp));
- gp.param = 18; /* HAS_ALIASING_PPGTT */
- gp.value = &val;
-
- if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp)))
- return 0;
-
+ val = i915_get_param(fd, I915_PARAM_HAS_ALIASING_PPGTT);
errno = 0;
+
return val;
}

@@ -1064,13 +1046,9 @@ bool gem_uses_full_ppgtt(int fd)
*/
int gem_gpu_reset_type(int fd)
{
- struct drm_i915_getparam gp;
int gpu_reset_type = -1;

- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_HAS_GPU_RESET;
- gp.value = &gpu_reset_type;
- drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ gpu_reset_type = i915_get_param(fd, I915_PARAM_HAS_GPU_RESET);

return gpu_reset_type;
}
@@ -1118,14 +1096,8 @@ int gem_available_fences(int fd)
static int num_fences = -1;

if (num_fences < 0) {
- struct drm_i915_getparam gp;
-
- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_NUM_FENCES_AVAIL;
- gp.value = &num_fences;
-
num_fences = 0;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ num_fences = i915_get_param(fd, I915_PARAM_NUM_FENCES_AVAIL);
errno = 0;
}

@@ -1137,14 +1109,8 @@ bool gem_has_llc(int fd)
static int has_llc = -1;

if (has_llc < 0) {
- struct drm_i915_getparam gp;
-
- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_HAS_LLC;
- gp.value = &has_llc;
-
has_llc = 0;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ has_llc = i915_get_param(fd, I915_PARAM_HAS_LLC);
errno = 0;
}

@@ -1394,14 +1360,8 @@ bool gem_has_softpin(int fd)
static int has_softpin = -1;

if (has_softpin < 0) {
- struct drm_i915_getparam gp;
-
- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_HAS_EXEC_SOFTPIN;
- gp.value = &has_softpin;
-
has_softpin = 0;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ has_softpin = i915_has_feature(fd, I915_PARAM_HAS_EXEC_SOFTPIN);
errno = 0;
}

@@ -1422,14 +1382,8 @@ bool gem_has_exec_fence(int fd)
static int has_exec_fence = -1;

if (has_exec_fence < 0) {
- struct drm_i915_getparam gp;
-
- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_HAS_EXEC_FENCE;
- gp.value = &has_exec_fence;
-
has_exec_fence = 0;
- ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+ has_exec_fence = i915_has_feature(fd, I915_PARAM_HAS_EXEC_FENCE);
errno = 0;
}

diff --git a/lib/meson.build b/lib/meson.build
index a3b24ea0..e987c32b 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -140,7 +140,8 @@ igt_deps = [ lib_igt ] + lib_deps
lin_igt_chipset_build = static_library('igt_chipset',
['intel_chipset.c',
'intel_device_info.c'],
- include_directories : inc)
+ include_directories : inc,
+ dependencies: lib_deps)

lib_igt_chipset = declare_dependency(link_with : lin_igt_chipset_build,
include_directories : inc)
--
2.17.2