summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorFrancois Dugast <francois.dugast@intel.com>2023-09-20 15:29:26 -0400
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-21 11:43:10 -0500
commit924e6a9789a05ef01ffdf849aa3a3c75f5a29a8b (patch)
treede5275878dea068979e2f6bbd9cb412a46efc302 /drivers/gpu/drm
parent78ddc872c6a91d8973ca89209793323efaa86345 (diff)
drm/xe/uapi: Remove MMIO ioctl
This was previously used in UMD for timestamp correlation, which can now be done with DRM_XE_QUERY_CS_CYCLES. Link: https://lore.kernel.org/all/20230706042044.GR6953@mdroper-desk1.amr.corp.intel.com/ Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/636 Signed-off-by: Francois Dugast <francois.dugast@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/xe/xe_device.c1
-rw-r--r--drivers/gpu/drm/xe/xe_mmio.c102
-rw-r--r--drivers/gpu/drm/xe/xe_mmio.h3
3 files changed, 0 insertions, 106 deletions
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 2bbd3aa2809b..ae0b7349c3e3 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -121,7 +121,6 @@ static const struct drm_ioctl_desc xe_ioctls[] = {
DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_DESTROY, xe_exec_queue_destroy_ioctl,
DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(XE_EXEC, xe_exec_ioctl, DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(XE_MMIO, xe_mmio_ioctl, DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_SET_PROPERTY, xe_exec_queue_set_property_ioctl,
DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(XE_WAIT_USER_FENCE, xe_wait_user_fence_ioctl,
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
index e4cf9bfec422..0da4f75c07bf 100644
--- a/drivers/gpu/drm/xe/xe_mmio.c
+++ b/drivers/gpu/drm/xe/xe_mmio.c
@@ -429,108 +429,6 @@ int xe_mmio_init(struct xe_device *xe)
return 0;
}
-#define VALID_MMIO_FLAGS (\
- DRM_XE_MMIO_BITS_MASK |\
- DRM_XE_MMIO_READ |\
- DRM_XE_MMIO_WRITE)
-
-static const struct xe_reg mmio_read_whitelist[] = {
- RING_TIMESTAMP(RENDER_RING_BASE),
-};
-
-int xe_mmio_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file)
-{
- struct xe_device *xe = to_xe_device(dev);
- struct xe_gt *gt = xe_root_mmio_gt(xe);
- struct drm_xe_mmio *args = data;
- unsigned int bits_flag, bytes;
- struct xe_reg reg;
- bool allowed;
- int ret = 0;
-
- if (XE_IOCTL_DBG(xe, args->extensions) ||
- XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))
- return -EINVAL;
-
- if (XE_IOCTL_DBG(xe, args->flags & ~VALID_MMIO_FLAGS))
- return -EINVAL;
-
- if (XE_IOCTL_DBG(xe, !(args->flags & DRM_XE_MMIO_WRITE) && args->value))
- return -EINVAL;
-
- allowed = capable(CAP_SYS_ADMIN);
- if (!allowed && ((args->flags & ~DRM_XE_MMIO_BITS_MASK) == DRM_XE_MMIO_READ)) {
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(mmio_read_whitelist); i++) {
- if (mmio_read_whitelist[i].addr == args->addr) {
- allowed = true;
- break;
- }
- }
- }
-
- if (XE_IOCTL_DBG(xe, !allowed))
- return -EPERM;
-
- bits_flag = args->flags & DRM_XE_MMIO_BITS_MASK;
- bytes = 1 << bits_flag;
- if (XE_IOCTL_DBG(xe, args->addr + bytes > xe->mmio.size))
- return -EINVAL;
-
- /*
- * TODO: migrate to xe_gt_mcr to lookup the mmio range and handle
- * multicast registers. Steering would need uapi extension.
- */
- reg = XE_REG(args->addr);
-
- xe_device_mem_access_get(xe);
- xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
-
- if (args->flags & DRM_XE_MMIO_WRITE) {
- switch (bits_flag) {
- case DRM_XE_MMIO_32BIT:
- if (XE_IOCTL_DBG(xe, args->value > U32_MAX)) {
- ret = -EINVAL;
- goto exit;
- }
- xe_mmio_write32(gt, reg, args->value);
- break;
- default:
- drm_dbg(&xe->drm, "Invalid MMIO bit size");
- fallthrough;
- case DRM_XE_MMIO_8BIT: /* TODO */
- case DRM_XE_MMIO_16BIT: /* TODO */
- ret = -EOPNOTSUPP;
- goto exit;
- }
- }
-
- if (args->flags & DRM_XE_MMIO_READ) {
- switch (bits_flag) {
- case DRM_XE_MMIO_32BIT:
- args->value = xe_mmio_read32(gt, reg);
- break;
- case DRM_XE_MMIO_64BIT:
- args->value = xe_mmio_read64_2x32(gt, reg);
- break;
- default:
- drm_dbg(&xe->drm, "Invalid MMIO bit size");
- fallthrough;
- case DRM_XE_MMIO_8BIT: /* TODO */
- case DRM_XE_MMIO_16BIT: /* TODO */
- ret = -EOPNOTSUPP;
- }
- }
-
-exit:
- xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
- xe_device_mem_access_put(xe);
-
- return ret;
-}
-
/**
* xe_mmio_read64_2x32() - Read a 64-bit register as two 32-bit reads
* @gt: MMIO target GT
diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h
index ae09f777d711..24a23dad7dce 100644
--- a/drivers/gpu/drm/xe/xe_mmio.h
+++ b/drivers/gpu/drm/xe/xe_mmio.h
@@ -124,9 +124,6 @@ static inline int xe_mmio_wait32(struct xe_gt *gt, struct xe_reg reg, u32 mask,
return ret;
}
-int xe_mmio_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file);
-
static inline bool xe_mmio_in_range(const struct xe_gt *gt,
const struct xe_mmio_range *range,
struct xe_reg reg)