@@ -1544,6 +1544,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
/* Reveal our presence to userspace */
if (drm_dev_register(dev, 0) == 0) {
i915_debugfs_register(dev_priv);
+ i915_guc_register(dev);
i915_setup_sysfs(dev);
} else
DRM_ERROR("Failed to register driver for userspace access!\n");
@@ -1582,6 +1583,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
intel_opregion_unregister(dev_priv);
i915_teardown_sysfs(dev_priv->dev);
+ i915_guc_unregister(dev_priv->dev);
i915_debugfs_unregister(dev_priv);
drm_dev_unregister(dev_priv->dev);
@@ -23,6 +23,8 @@
*/
#include <linux/firmware.h>
#include <linux/circ_buf.h>
+#include <linux/debugfs.h>
+#include <linux/relay.h>
#include "i915_drv.h"
#include "intel_guc.h"
@@ -830,7 +832,16 @@ err:
static void* guc_get_write_buffer(struct intel_guc *guc)
{
- return NULL;
+ /* FIXME: Cover the check under a lock ? */
+ if (!guc->log.relay_chan)
+ return NULL;
+
+ /* Get the pointer to relay sub buffer and copy data into it ourselves.
+ * Could have used the relay_write() to indirectly copy the data, but
+ * that would have been bit convoluted, as we also need to update the
+ * first page containing state data.
+ */
+ return relay_reserve(guc->log.relay_chan, guc->log.obj->base.size);
}
static void guc_read_update_log_buffer(struct drm_device *dev, bool capture_all)
@@ -897,6 +908,152 @@ static void guc_read_update_log_buffer(struct drm_device *dev, bool capture_all)
}
}
+/*
+ * Sub buffer switch callback. If this callback is not implemented
+ * relay will operate in non-overwrite mode so will stop accepting
+ * new data if there are no empty sub buffers left.
+ */
+static int subbuf_start_callback(struct rchan_buf *buf,
+ void *subbuf,
+ void *prev_subbuf,
+ size_t prev_padding)
+{
+ /* Always switch to next sub buffer as we don't mind overwriting of
+ * old data/logs.
+ */
+ return 1;
+}
+
+/*
+ * file_create() callback. Creates relay file in debugfs.
+ */
+static struct dentry *create_buf_file_callback(const char *filename,
+ struct dentry *parent,
+ umode_t mode,
+ struct rchan_buf *buf,
+ int *is_global)
+{
+ /*
+ * Not using the channel filename passed as an argument, since for each
+ * channel relay appends the corresponding CPU number to the filename
+ * passed in relay_open(). This should be fine as relay just needs a
+ * dentry of the file associated with the channel buffer and that file's
+ * name need not be same as the filename passed as an argument.
+ */
+ struct dentry *buf_file = debugfs_create_file("guc_log", mode,
+ parent, buf, &relay_file_operations);
+
+ /* This to enable the use of a single buffer for the relay channel and
+ * correspondingly have a single file exposed to User, through which
+ * it can pull the logs in order without any post-processing.
+ */
+ *is_global = 1;
+
+ return buf_file;
+}
+
+/*
+ * file_remove() default callback. Removes relay file in debugfs.
+ */
+static int remove_buf_file_callback(struct dentry *dentry)
+{
+ debugfs_remove(dentry);
+ return 0;
+}
+
+/* relay channel callbacks */
+static struct rchan_callbacks relay_callbacks = {
+ .subbuf_start = subbuf_start_callback,
+ .create_buf_file = create_buf_file_callback,
+ .remove_buf_file = remove_buf_file_callback,
+};
+
+static void guc_remove_log_relay_file(struct intel_guc *guc)
+{
+ relay_close(guc->log.relay_chan);
+}
+
+static int guc_create_log_relay_file(struct intel_guc *guc)
+{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+ struct drm_device *dev = dev_priv->dev;
+ struct dentry *log_dir;
+ struct rchan *guc_log_relay_chan;
+ size_t n_subbufs, subbuf_size;
+
+ if (guc->log.relay_chan)
+ return 0;
+
+ /* If /sys/kernel/debug/dri/0 location do not exist, then debugfs is
+ * not mounted and so can't create the relay file.
+ * The relay API seems to fit well with debugfs only.
+ */
+ if (!dev->primary->debugfs_root)
+ return -ENODEV;
+
+ /* For now create the log file in /sys/kernel/debug/dri/0 dir */
+ log_dir = dev->primary->debugfs_root;
+
+ /* Keep the size of sub buffers same as shared log buffer */
+ subbuf_size = guc->log.obj->base.size;
+ /* TODO: Decide based on the User's input */
+ n_subbufs = 4;
+
+ guc_log_relay_chan = relay_open("guc_log", log_dir,
+ subbuf_size, n_subbufs, &relay_callbacks, dev);
+
+ if (!guc_log_relay_chan) {
+ DRM_DEBUG_DRIVER("Couldn't create relay chan for guc logs\n");
+ return -ENOMEM;
+ }
+
+ /* FIXME: Cover the update under a lock ? */
+ guc->log.relay_chan = guc_log_relay_chan;
+ return 0;
+}
+
+static void guc_log_cleanup(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc *guc = &dev_priv->guc;
+
+ lockdep_assert_held(&dev->struct_mutex);
+
+ if (i915.guc_log_level < 0)
+ return;
+
+ /* First disable the flush interrupt */
+ gen9_disable_guc_interrupts(dev_priv);
+
+ guc_remove_log_relay_file(guc);
+}
+
+static int guc_log_late_setup(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc *guc = &dev_priv->guc;
+ int ret;
+
+ lockdep_assert_held(&dev->struct_mutex);
+
+ if (i915.guc_log_level < 0)
+ return -EINVAL;
+
+ if (WARN_ON(guc->log.relay_chan))
+ return -EINVAL;
+
+ ret = guc_create_log_relay_file(guc);
+ if (ret)
+ goto err;
+
+ return 0;
+err:
+ /* logging will remain off */
+ i915.guc_log_level = -1;
+ gen9_disable_guc_interrupts(dev_priv);
+ return ret;
+}
+
static void guc_create_log(struct intel_guc *guc)
{
struct drm_i915_private *dev_priv = guc_to_i915(guc);
@@ -1165,3 +1322,23 @@ void i915_guc_capture_logs(struct drm_device *dev, bool capture_all)
host2guc_logbuffer_flush_complete(&dev_priv->guc);
}
+
+void i915_guc_unregister(struct drm_device *dev)
+{
+ if (!i915.enable_guc_submission)
+ return;
+
+ mutex_lock(&dev->struct_mutex);
+ guc_log_cleanup(dev);
+ mutex_unlock(&dev->struct_mutex);
+}
+
+void i915_guc_register(struct drm_device *dev)
+{
+ if (!i915.enable_guc_submission)
+ return;
+
+ mutex_lock(&dev->struct_mutex);
+ guc_log_late_setup(dev);
+ mutex_unlock(&dev->struct_mutex);
+}
@@ -126,6 +126,7 @@ struct intel_guc_log {
uint32_t flags;
struct drm_i915_gem_object *obj;
struct workqueue_struct *wq;
+ struct rchan *relay_chan;
};
struct intel_guc {
@@ -173,5 +174,7 @@ int i915_guc_submit(struct drm_i915_gem_request *rq);
void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
void i915_guc_capture_logs(struct drm_device *dev, bool capture_all);
+void i915_guc_register(struct drm_device *dev);
+void i915_guc_unregister(struct drm_device *dev);
#endif