Mesa (main): iris: finish converting from drmIoctl to intel_ioctl

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 697804ba49cad1e9b07f2d5a1878736eda18dd2f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=697804ba49cad1e9b07f2d5a1878736eda18dd2f

Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
Date:   Tue Apr  6 17:15:21 2021 -0700

iris: finish converting from drmIoctl to intel_ioctl

Only 3 remaining users. The implementations are exactly the same.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11194>

---

 src/gallium/drivers/iris/iris_batch.c  | 2 +-
 src/gallium/drivers/iris/iris_bufmgr.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 488db8d9203..0e4c414e53a 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -599,7 +599,7 @@ iris_batch_check_for_reset(struct iris_batch *batch)
    enum pipe_reset_status status = PIPE_NO_RESET;
    struct drm_i915_reset_stats stats = { .ctx_id = batch->hw_ctx_id };
 
-   if (drmIoctl(screen->fd, DRM_IOCTL_I915_GET_RESET_STATS, &stats))
+   if (intel_ioctl(screen->fd, DRM_IOCTL_I915_GET_RESET_STATS, &stats))
       DBG("DRM_IOCTL_I915_GET_RESET_STATS failed: %s\n", strerror(errno));
 
    if (stats.batch_active != 0) {
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index 2e22dc8fd79..ecaaaa2b311 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -1446,7 +1446,7 @@ iris_create_hw_context(struct iris_bufmgr *bufmgr)
       .param = I915_CONTEXT_PARAM_RECOVERABLE,
       .value = false,
    };
-   drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM, &p);
+   intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM, &p);
 
    return create.ctx_id;
 }
@@ -1458,7 +1458,7 @@ iris_hw_context_get_priority(struct iris_bufmgr *bufmgr, uint32_t ctx_id)
       .ctx_id = ctx_id,
       .param = I915_CONTEXT_PARAM_PRIORITY,
    };
-   drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p);
+   intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p);
    return p.value; /* on error, return 0 i.e. default priority */
 }