drm/xe: Add sysfs entry for tile

We have recently introduced tile for each gpu,
so lets add sysfs entry per tile for userspace
to provide required information specific to tile.

V5:
  - define ktype as const
V4:
  - Reorder headers - Aravind
V3:
  - Make API to return void and add drm_warn - Aravind
V2:
  - Add logs in failure path

Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 8d6d3c070fc856c8a12a1d4222069473c0999b6c..3ade82cf244e9467c9dc714cec6b9b90fa393c43 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -103,6 +103,7 @@ xe-y += xe_bb.o \
        xe_step.o \
        xe_sync.o \
        xe_tile.o \
+       xe_tile_sysfs.o \
        xe_trace.o \
        xe_ttm_sys_mgr.o \
        xe_ttm_stolen_mgr.o \

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 3b50134cdcc0dd387342f577fde2a190eae33c9f..5517229bb505bd71426cb81957b619fe3e4aba9a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -144,6 +144,9 @@ struct xe_tile {
 
        /** @migrate: Migration helper for vram blits and clearing */
        struct xe_migrate *migrate;
+
+       /** @sysfs: sysfs' kobj used by xe_tile_sysfs */
+       struct kobject *sysfs;
 };
 
 /**

diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
index 6414aa810355ee884f1912fccf5b7c1d7f62b553..ac70486d09c327aeefc6a5627158168321abf712 100644 (file)
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -10,6 +10,7 @@
 #include "xe_migrate.h"
 #include "xe_sa.h"
 #include "xe_tile.h"
+#include "xe_tile_sysfs.h"
 #include "xe_ttm_vram_mgr.h"
 
 /**
@@ -142,6 +143,8 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
        if (IS_ERR(tile->mem.kernel_bb_pool))
                err = PTR_ERR(tile->mem.kernel_bb_pool);
 
+       xe_tile_sysfs_init(tile);
+
 err_mem_access:
        xe_device_mem_access_put(tile_to_xe(tile));
        return err;

diff --git a/drivers/gpu/drm/xe/xe_tile.h b/drivers/gpu/drm/xe/xe_tile.h
index 33bf41292195312dc30b6cf3fd49893683107dc3..782c47f8bd450ea01f7a6781374c5efda28f76ab 100644 (file)
--- a/drivers/gpu/drm/xe/xe_tile.h
+++ b/drivers/gpu/drm/xe/xe_tile.h
@@ -6,6 +6,8 @@
 #ifndef _XE_TILE_H_
 #define _XE_TILE_H_
 
+#include "xe_device_types.h"
+
 struct xe_tile;
 
 int xe_tile_alloc(struct xe_tile *tile);

diff --git a/drivers/gpu/drm/xe/xe_tile_sysfs.c b/drivers/gpu/drm/xe/xe_tile_sysfs.c
new file mode 100644 (file)
index 0000000..2d64fa5
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_tile_sysfs.c
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
+#include <drm/drm_managed.h>
+
+#include "xe_tile.h"
+#include "xe_tile_sysfs.h"
+
+static void xe_tile_sysfs_kobj_release(struct kobject *kobj)
+{
+       kfree(kobj);
+}
+
+static const struct kobj_type xe_tile_sysfs_kobj_type = {
+       .release = xe_tile_sysfs_kobj_release,
+       .sysfs_ops = &kobj_sysfs_ops,
+};
+
+static void tile_sysfs_fini(struct drm_device *drm, void *arg)
+{
+       struct xe_tile *tile = arg;
+
+       kobject_put(tile->sysfs);
+}
+
+void xe_tile_sysfs_init(struct xe_tile *tile)
+{
+       struct xe_device *xe = tile_to_xe(tile);
+       struct device *dev = xe->drm.dev;
+       struct kobj_tile *kt;
+       int err;
+
+       kt = kzalloc(sizeof(*kt), GFP_KERNEL);
+       if (!kt)
+               return;
+
+       kobject_init(&kt->base, &xe_tile_sysfs_kobj_type);
+       kt->tile = tile;
+
+       err = kobject_add(&kt->base, &dev->kobj, "tile%d", tile->id);
+       if (err) {
+               kobject_put(&kt->base);
+               drm_warn(&xe->drm, "failed to register TILE sysfs directory, err: %d\n", err);
+               return;
+       }
+
+       tile->sysfs = &kt->base;
+
+       err = drmm_add_action_or_reset(&xe->drm, tile_sysfs_fini, tile);
+       if (err) {
+               drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n",
+                        __func__, err);
+               return;
+       }
+}

diff --git a/drivers/gpu/drm/xe/xe_tile_sysfs.h b/drivers/gpu/drm/xe/xe_tile_sysfs.h
new file mode 100644 (file)
index 0000000..e4f0650
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_tile_sysfs.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_TILE_SYSFS_H_
+#define _XE_TILE_SYSFS_H_
+
+#include "xe_tile_sysfs_types.h"
+
+void xe_tile_sysfs_init(struct xe_tile *tile);
+
+static inline struct xe_tile *
+kobj_to_tile(struct kobject *kobj)
+{
+       return container_of(kobj, struct kobj_tile, base)->tile;
+}
+
+#endif /* _XE_TILE_SYSFS_H_ */

diff --git a/drivers/gpu/drm/xe/xe_tile_sysfs_types.h b/drivers/gpu/drm/xe/xe_tile_sysfs_types.h
new file mode 100644 (file)
index 0000000..75906ba
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_tile_sysfs_types.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_TILE_SYSFS_TYPES_H_
+#define _XE_TILE_SYSFS_TYPES_H_
+
+#include <linux/kobject.h>
+
+struct xe_tile;
+
+/**
+ * struct kobj_tile - A tile's kobject struct that connects the kobject
+ * and the TILE
+ *
+ * When dealing with multiple TILEs, this struct helps to understand which
+ * TILE needs to be addressed on a given sysfs call.
+ */
+struct kobj_tile {
+       /** @base: The actual kobject */
+       struct kobject base;
+       /** @tile: A pointer to the tile itself */
+       struct xe_tile *tile;
+};
+
+#endif /* _XE_TILE_SYSFS_TYPES_H_ */