* [PATCH v4 1/7] drm/i915/perf: introduce a versioning of the i915-perf uapi
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 2/7] drm/i915/perf: allow for CS OA configs to be created lazily Lionel Landwerlin
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
Reporting this version will help application figure out what level of
the support the running kernel provides.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 3 +++
include/uapi/drm/i915_drm.h | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1af6751e1b36..9ed4d0016ee1 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -474,6 +474,9 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,
case I915_PARAM_MMAP_GTT_COHERENT:
value = INTEL_INFO(dev_priv)->has_coherent_ggtt;
break;
+ case I915_PARAM_PERF_REVISION:
+ value = 1;
+ break;
default:
DRM_DEBUG("Unknown parameter %d\n", param->param);
return -EINVAL;
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 328d05e77d9f..e27a8eda9121 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -610,6 +610,13 @@ typedef struct drm_i915_irq_wait {
* See I915_EXEC_FENCE_OUT and I915_EXEC_FENCE_SUBMIT.
*/
#define I915_PARAM_HAS_EXEC_SUBMIT_FENCE 53
+
+/*
+ * Revision of the i915-perf uAPI. The value returned helps determine what
+ * i915-perf features are available. See drm_i915_perf_property_id.
+ */
+#define I915_PARAM_PERF_REVISION 54
+
/* Must be kept compact -- no holes and well documented */
typedef struct drm_i915_getparam {
@@ -1843,23 +1850,31 @@ enum drm_i915_perf_property_id {
* Open the stream for a specific context handle (as used with
* execbuffer2). A stream opened for a specific context this way
* won't typically require root privileges.
+ *
+ * This property is available in perf revision 1.
*/
DRM_I915_PERF_PROP_CTX_HANDLE = 1,
/**
* A value of 1 requests the inclusion of raw OA unit reports as
* part of stream samples.
+ *
+ * This property is available in perf revision 1.
*/
DRM_I915_PERF_PROP_SAMPLE_OA,
/**
* The value specifies which set of OA unit metrics should be
* be configured, defining the contents of any OA unit reports.
+ *
+ * This property is available in perf revision 1.
*/
DRM_I915_PERF_PROP_OA_METRICS_SET,
/**
* The value specifies the size and layout of OA unit reports.
+ *
+ * This property is available in perf revision 1.
*/
DRM_I915_PERF_PROP_OA_FORMAT,
@@ -1869,6 +1884,8 @@ enum drm_i915_perf_property_id {
* from this exponent as follows:
*
* 80ns * 2^(period_exponent + 1)
+ *
+ * This property is available in perf revision 1.
*/
DRM_I915_PERF_PROP_OA_EXPONENT,
@@ -1900,6 +1917,8 @@ struct drm_i915_perf_open_param {
* to close and re-open a stream with the same configuration.
*
* It's undefined whether any pending data for the stream will be lost.
+ *
+ * This ioctl is available in perf revision 1.
*/
#define I915_PERF_IOCTL_ENABLE _IO('i', 0x0)
@@ -1907,6 +1926,8 @@ struct drm_i915_perf_open_param {
* Disable data capture for a stream.
*
* It is an error to try and read a stream that is disabled.
+ *
+ * This ioctl is available in perf revision 1.
*/
#define I915_PERF_IOCTL_DISABLE _IO('i', 0x1)
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 2/7] drm/i915/perf: allow for CS OA configs to be created lazily
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 1/7] drm/i915/perf: introduce a versioning of the i915-perf uapi Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 3/7] drm/i915: introduce a mechanism to extend execbuf2 Lionel Landwerlin
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
Here we introduce a mechanism by which the execbuf part of the i915
driver will be able to request that a batch buffer containing the
programming for a particular OA config be created.
We'll execute these OA configuration buffers right before executing a
set of userspace commands so that a particular user batchbuffer be
executed with a given OA configuration.
This mechanism essentially allows the userspace driver to go through
several OA configuration without having to open/close the i915/perf
stream.
v2: No need for locking on object OA config object creation (Chris)
Flush cpu mapping of OA config (Chris)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 +
drivers/gpu/drm/i915/i915_drv.h | 22 ++-
drivers/gpu/drm/i915/i915_perf.c | 171 +++++++++++++++----
3 files changed, 162 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
index eec31e36aca7..e7eff9db343e 100644
--- a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
+++ b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
@@ -126,6 +126,7 @@
*/
#define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*(x)-1)
#define MI_LRI_FORCE_POSTED (1<<12)
+#define MI_LOAD_REGISTER_IMM_MAX_REGS (126)
#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1)
#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)
#define MI_SRM_LRM_GLOBAL_GTT (1<<22)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 89bf1e34feaa..83a32e9d86b5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1170,6 +1170,10 @@ struct i915_oa_config {
struct attribute *attrs[2];
struct device_attribute sysfs_metric_id;
+ struct drm_i915_gem_object *obj;
+
+ struct list_head vma_link;
+
atomic_t ref_count;
};
@@ -1759,11 +1763,21 @@ struct drm_i915_private {
struct mutex metrics_lock;
/*
- * List of dynamic configurations, you need to hold
- * dev_priv->perf.metrics_lock to access it.
+ * List of dynamic configurations (struct i915_oa_config), you
+ * need to hold dev_priv->perf.metrics_lock to access it.
*/
struct idr metrics_idr;
+ /*
+ * List of dynamic configurations (struct i915_oa_config)
+ * which have an allocated buffer in GGTT for reconfiguration,
+ * you need to hold dev_priv->perf.metrics_lock to access it.
+ * Elements are added to the list lazilly on execbuf (when a
+ * particular configuration is requested). The list is freed
+ * upon closing the perf stream.
+ */
+ struct list_head metrics_buffers;
+
/*
* Lock associated with anything below within this structure
* except exclusive_stream.
@@ -2709,6 +2723,10 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
void i915_oa_init_reg_state(struct intel_engine_cs *engine,
struct intel_context *ce,
u32 *reg_state);
+int i915_perf_get_oa_config(struct drm_i915_private *i915,
+ int metrics_set,
+ struct i915_oa_config **out_config,
+ struct drm_i915_gem_object **out_obj);
/* i915_gem_evict.c */
int __must_check i915_gem_evict_something(struct i915_address_space *vm,
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 2e33a9b4eae7..e0071e44de3d 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -366,9 +366,16 @@ struct perf_open_properties {
int oa_period_exponent;
};
-static void free_oa_config(struct drm_i915_private *dev_priv,
- struct i915_oa_config *oa_config)
+static void put_oa_config(struct i915_oa_config *oa_config)
{
+ if (!atomic_dec_and_test(&oa_config->ref_count))
+ return;
+
+ if (oa_config->obj) {
+ list_del(&oa_config->vma_link);
+ i915_gem_object_put(oa_config->obj);
+ }
+
if (!PTR_ERR(oa_config->flex_regs))
kfree(oa_config->flex_regs);
if (!PTR_ERR(oa_config->b_counter_regs))
@@ -378,38 +385,126 @@ static void free_oa_config(struct drm_i915_private *dev_priv,
kfree(oa_config);
}
-static void put_oa_config(struct drm_i915_private *dev_priv,
- struct i915_oa_config *oa_config)
+static u32 *write_cs_mi_lri(u32 *cs, const struct i915_oa_reg *reg_data, u32 n_regs)
{
- if (!atomic_dec_and_test(&oa_config->ref_count))
- return;
+ u32 i;
- free_oa_config(dev_priv, oa_config);
+ for (i = 0; i < n_regs; i++) {
+ if ((i % MI_LOAD_REGISTER_IMM_MAX_REGS) == 0) {
+ u32 n_lri = min(n_regs - i,
+ (u32) MI_LOAD_REGISTER_IMM_MAX_REGS);
+
+ *cs++ = MI_LOAD_REGISTER_IMM(n_lri);
+ }
+ *cs++ = i915_mmio_reg_offset(reg_data[i].addr);
+ *cs++ = reg_data[i].value;
+ }
+
+ return cs;
}
-static int get_oa_config(struct drm_i915_private *dev_priv,
- int metrics_set,
- struct i915_oa_config **out_config)
+static int alloc_oa_config_buffer(struct drm_i915_private *i915,
+ struct i915_oa_config *oa_config)
{
- int ret;
+ struct drm_i915_gem_object *bo;
+ size_t config_length = 0;
+ u32 *cs;
- if (metrics_set == 1) {
- *out_config = &dev_priv->perf.oa.test_config;
- atomic_inc(&dev_priv->perf.oa.test_config.ref_count);
- return 0;
+ if (oa_config->mux_regs_len > 0) {
+ config_length += DIV_ROUND_UP(oa_config->mux_regs_len,
+ MI_LOAD_REGISTER_IMM_MAX_REGS) * 4;
+ config_length += oa_config->mux_regs_len * 8;
+ }
+ if (oa_config->b_counter_regs_len > 0) {
+ config_length += DIV_ROUND_UP(oa_config->b_counter_regs_len,
+ MI_LOAD_REGISTER_IMM_MAX_REGS) * 4;
+ config_length += oa_config->b_counter_regs_len * 8;
+ }
+ if (oa_config->flex_regs_len > 0) {
+ config_length += DIV_ROUND_UP(oa_config->flex_regs_len,
+ MI_LOAD_REGISTER_IMM_MAX_REGS) * 4;
+ config_length += oa_config->flex_regs_len * 8;
}
+ config_length += 4; /* MI_BATCH_BUFFER_END */
+ config_length = ALIGN(config_length, I915_GTT_PAGE_SIZE);
- ret = mutex_lock_interruptible(&dev_priv->perf.metrics_lock);
+ bo = i915_gem_object_create_shmem(i915, config_length);
+ if (IS_ERR(bo))
+ return PTR_ERR(bo);
+
+ cs = i915_gem_object_pin_map(bo, I915_MAP_WB);
+ if (IS_ERR(cs)) {
+ i915_gem_object_put(bo);
+ return PTR_ERR(cs);
+ }
+
+ cs = write_cs_mi_lri(cs, oa_config->mux_regs, oa_config->mux_regs_len);
+ cs = write_cs_mi_lri(cs, oa_config->b_counter_regs, oa_config->b_counter_regs_len);
+ cs = write_cs_mi_lri(cs, oa_config->flex_regs, oa_config->flex_regs_len);
+
+ *cs++ = MI_BATCH_BUFFER_END;
+
+ i915_gem_object_flush_map(bo);
+ i915_gem_object_unpin_map(bo);
+
+ oa_config->obj = bo;
+
+ return 0;
+}
+
+int i915_perf_get_oa_config(struct drm_i915_private *i915,
+ int metrics_set,
+ struct i915_oa_config **out_config,
+ struct drm_i915_gem_object **out_obj)
+{
+ int ret = 0;
+ struct i915_oa_config *oa_config;
+
+ if (!i915->perf.initialized)
+ return -ENODEV;
+
+ ret = mutex_lock_interruptible(&i915->perf.metrics_lock);
if (ret)
return ret;
- *out_config = idr_find(&dev_priv->perf.metrics_idr, metrics_set);
- if (!*out_config)
- ret = -EINVAL;
- else
- atomic_inc(&(*out_config)->ref_count);
+ if (metrics_set == 1) {
+ oa_config = &i915->perf.oa.test_config;
+ } else {
+ oa_config = idr_find(&i915->perf.metrics_idr, metrics_set);
+ if (!oa_config) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+ }
- mutex_unlock(&dev_priv->perf.metrics_lock);
+ if (out_config) {
+ atomic_inc(&oa_config->ref_count);
+ *out_config = oa_config;
+ }
+
+ if (out_obj) {
+ if (oa_config->obj) {
+ *out_obj = i915_gem_object_get(oa_config->obj);
+ } else {
+ ret = alloc_oa_config_buffer(i915, oa_config);
+ if (ret)
+ goto err_buf_alloc;
+
+ list_add(&oa_config->vma_link,
+ &i915->perf.metrics_buffers);
+ *out_obj = i915_gem_object_get(oa_config->obj);
+ }
+ }
+
+ goto unlock;
+
+err_buf_alloc:
+ if (out_config) {
+ put_oa_config(oa_config);
+ *out_config = NULL;
+ }
+unlock:
+ mutex_unlock(&i915->perf.metrics_lock);
return ret;
}
@@ -1380,7 +1475,7 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)
if (stream->ctx)
oa_put_render_ctx_id(stream);
- put_oa_config(dev_priv, stream->oa_config);
+ put_oa_config(stream->oa_config);
if (dev_priv->perf.oa.spurious_report_rs.missed) {
DRM_NOTE("%d spurious OA report notices suppressed due to ratelimiting\n",
@@ -2094,7 +2189,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
}
}
- ret = get_oa_config(dev_priv, props->metrics_set, &stream->oa_config);
+ ret = i915_perf_get_oa_config(dev_priv, props->metrics_set,
+ &stream->oa_config, NULL);
if (ret) {
DRM_DEBUG("Invalid OA config id=%i\n", props->metrics_set);
goto err_config;
@@ -2132,6 +2228,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
goto err_enable;
}
+ DRM_DEBUG("opening stream oa config uuid=%s\n", stream->oa_config->uuid);
+
mutex_unlock(&dev_priv->drm.struct_mutex);
return 0;
@@ -2145,7 +2243,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
free_oa_buffer(dev_priv);
err_oa_buf_alloc:
- put_oa_config(dev_priv, stream->oa_config);
+ put_oa_config(stream->oa_config);
intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);
intel_runtime_pm_put(dev_priv, stream->wakeref);
@@ -2512,9 +2610,21 @@ static int i915_perf_release(struct inode *inode, struct file *file)
{
struct i915_perf_stream *stream = file->private_data;
struct drm_i915_private *dev_priv = stream->dev_priv;
+ struct i915_oa_config *oa_config, *next;
mutex_lock(&dev_priv->perf.lock);
+
i915_perf_destroy_locked(stream);
+
+ /* Dispose of all oa config batch buffers. */
+ mutex_lock(&dev_priv->perf.metrics_lock);
+ list_for_each_entry_safe(oa_config, next, &dev_priv->perf.metrics_buffers, vma_link) {
+ list_del(&oa_config->vma_link);
+ i915_gem_object_put(oa_config->obj);
+ oa_config->obj = NULL;
+ }
+ mutex_unlock(&dev_priv->perf.metrics_lock);
+
mutex_unlock(&dev_priv->perf.lock);
return 0;
@@ -3296,7 +3406,7 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
sysfs_err:
mutex_unlock(&dev_priv->perf.metrics_lock);
reg_err:
- put_oa_config(dev_priv, oa_config);
+ put_oa_config(oa_config);
DRM_DEBUG("Failed to add new OA config\n");
return err;
}
@@ -3350,7 +3460,7 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
DRM_DEBUG("Removed config %s id=%i\n", oa_config->uuid, oa_config->id);
- put_oa_config(dev_priv, oa_config);
+ put_oa_config(oa_config);
config_err:
mutex_unlock(&dev_priv->perf.metrics_lock);
@@ -3492,6 +3602,8 @@ void i915_perf_init(struct drm_i915_private *dev_priv)
init_waitqueue_head(&dev_priv->perf.oa.poll_wq);
INIT_LIST_HEAD(&dev_priv->perf.streams);
+ INIT_LIST_HEAD(&dev_priv->perf.metrics_buffers);
+
mutex_init(&dev_priv->perf.lock);
spin_lock_init(&dev_priv->perf.oa.oa_buffer.ptr_lock);
@@ -3508,10 +3620,9 @@ void i915_perf_init(struct drm_i915_private *dev_priv)
static int destroy_config(int id, void *p, void *data)
{
- struct drm_i915_private *dev_priv = data;
struct i915_oa_config *oa_config = p;
- put_oa_config(dev_priv, oa_config);
+ put_oa_config(oa_config);
return 0;
}
@@ -3525,7 +3636,7 @@ void i915_perf_fini(struct drm_i915_private *dev_priv)
if (!dev_priv->perf.initialized)
return;
- idr_for_each(&dev_priv->perf.metrics_idr, destroy_config, dev_priv);
+ idr_for_each(&dev_priv->perf.metrics_idr, destroy_config, NULL);
idr_destroy(&dev_priv->perf.metrics_idr);
unregister_sysctl_table(dev_priv->perf.sysctl_header);
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 3/7] drm/i915: introduce a mechanism to extend execbuf2
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 1/7] drm/i915/perf: introduce a versioning of the i915-perf uapi Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 2/7] drm/i915/perf: allow for CS OA configs to be created lazily Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 4/7] drm/i915: add syncobj timeline support Lionel Landwerlin
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
We're planning to use this for a couple of new feature where we need
to provide additional parameters to execbuf.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 30 ++++++++++++++++++-
include/uapi/drm/i915_drm.h | 25 ++++++++++++++--
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index ed522fdfbe7f..a961fab70fb2 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -20,6 +20,7 @@
#include "i915_gem_clflush.h"
#include "i915_gem_context.h"
#include "i915_trace.h"
+#include "i915_user_extensions.h"
#include "intel_drv.h"
#include "intel_frontbuffer.h"
@@ -269,6 +270,10 @@ struct i915_execbuffer {
*/
int lut_size;
struct hlist_head *buckets; /** ht for relocation handles */
+
+ struct {
+ u64 flags; /** Available extensions parameters */
+ } extensions;
};
#define exec_entry(EB, VMA) (&(EB)->exec[(VMA)->exec_flags - (EB)->flags])
@@ -1958,7 +1963,7 @@ static bool i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
return false;
/* Kernel clipping was a DRI1 misfeature */
- if (!(exec->flags & I915_EXEC_FENCE_ARRAY)) {
+ if (!(exec->flags & (I915_EXEC_FENCE_ARRAY | I915_EXEC_EXT))) {
if (exec->num_cliprects || exec->cliprects_ptr)
return false;
}
@@ -2336,6 +2341,22 @@ signal_fence_array(struct i915_execbuffer *eb,
}
}
+static const i915_user_extension_fn execbuf_extensions[] = {
+};
+
+static int
+parse_execbuf2_extensions(struct drm_i915_gem_execbuffer2 *args,
+ struct i915_execbuffer *eb)
+{
+ if (args->num_cliprects != 0)
+ return -EINVAL;
+
+ return i915_user_extensions(u64_to_user_ptr(args->cliprects_ptr),
+ execbuf_extensions,
+ ARRAY_SIZE(execbuf_extensions),
+ eb);
+}
+
static int
i915_gem_do_execbuffer(struct drm_device *dev,
struct drm_file *file,
@@ -2382,6 +2403,13 @@ i915_gem_do_execbuffer(struct drm_device *dev,
if (args->flags & I915_EXEC_IS_PINNED)
eb.batch_flags |= I915_DISPATCH_PINNED;
+ eb.extensions.flags = 0;
+ if (args->flags & I915_EXEC_EXT) {
+ err = parse_execbuf2_extensions(args, &eb);
+ if (err)
+ return err;
+ }
+
if (args->flags & I915_EXEC_FENCE_IN) {
in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));
if (!in_fence)
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index e27a8eda9121..efa195d6994e 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1013,6 +1013,10 @@ struct drm_i915_gem_exec_fence {
__u32 flags;
};
+enum drm_i915_gem_execbuffer_ext {
+ DRM_I915_GEM_EXECBUFFER_EXT_MAX /* non-ABI */
+};
+
struct drm_i915_gem_execbuffer2 {
/**
* List of gem_exec_object2 structs
@@ -1029,8 +1033,14 @@ struct drm_i915_gem_execbuffer2 {
__u32 num_cliprects;
/**
* This is a struct drm_clip_rect *cliprects if I915_EXEC_FENCE_ARRAY
- * is not set. If I915_EXEC_FENCE_ARRAY is set, then this is a
- * struct drm_i915_gem_exec_fence *fences.
+ * & I915_EXEC_EXT are not set.
+ *
+ * If I915_EXEC_FENCE_ARRAY is set, then this is a pointer to an array
+ * of struct drm_i915_gem_exec_fence and num_cliprects is the length
+ * of the array.
+ *
+ * If I915_EXEC_EXT is set, then this is a pointer to a single struct
+ * drm_i915_gem_base_execbuffer_ext and num_cliprects is 0.
*/
__u64 cliprects_ptr;
#define I915_EXEC_RING_MASK (0x3f)
@@ -1148,7 +1158,16 @@ struct drm_i915_gem_execbuffer2 {
*/
#define I915_EXEC_FENCE_SUBMIT (1 << 20)
-#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_SUBMIT << 1))
+/*
+ * Setting I915_EXEC_EXT implies that drm_i915_gem_execbuffer2.cliprects_ptr
+ * is treated as a pointer to an linked list of i915_user_extension. Each
+ * i915_user_extension node is the base of a larger structure. The list of
+ * supported structures are listed in the drm_i915_gem_execbuffer_ext
+ * enum.
+ */
+#define I915_EXEC_EXT (1 << 21)
+
+#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_EXT<<1))
#define I915_EXEC_CONTEXT_ID_MASK (0xffffffff)
#define i915_execbuffer2_set_context_id(eb2, context) \
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 4/7] drm/i915: add syncobj timeline support
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (2 preceding siblings ...)
2019-06-05 13:38 ` [PATCH v4 3/7] drm/i915: introduce a mechanism to extend execbuf2 Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 5/7] drm/i915: add a new perf configuration execbuf parameter Lionel Landwerlin
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
Introduces a new parameters to execbuf so that we can specify syncobj
handles as well as timeline points.
v2: Reuse i915_user_extension_fn
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 279 ++++++++++++++----
drivers/gpu/drm/i915/i915_drv.c | 4 +-
include/uapi/drm/i915_drm.h | 37 +++
3 files changed, 263 insertions(+), 57 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index a961fab70fb2..86864ec76a8b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -211,6 +211,13 @@ enum {
* the batchbuffer in trusted mode, otherwise the ioctl is rejected.
*/
+struct i915_drm_dma_fences {
+ struct drm_syncobj *syncobj; /* Use with ptr_mask_bits() */
+ struct dma_fence *dma_fence;
+ u64 value;
+ struct dma_fence_chain *chain_fence;
+};
+
struct i915_execbuffer {
struct drm_i915_private *i915; /** i915 backpointer */
struct drm_file *file; /** per-file lookup tables and limits */
@@ -273,6 +280,7 @@ struct i915_execbuffer {
struct {
u64 flags; /** Available extensions parameters */
+ struct drm_i915_gem_execbuffer_ext_timeline_fences timeline_fences;
} extensions;
};
@@ -2213,67 +2221,193 @@ eb_select_engine(struct i915_execbuffer *eb,
}
static void
-__free_fence_array(struct drm_syncobj **fences, unsigned int n)
+__free_fence_array(struct i915_drm_dma_fences *fences, unsigned int n)
{
- while (n--)
- drm_syncobj_put(ptr_mask_bits(fences[n], 2));
+ while (n--) {
+ drm_syncobj_put(ptr_mask_bits(fences[n].syncobj, 2));
+ dma_fence_put(fences[n].dma_fence);
+ kfree(fences[n].chain_fence);
+ }
kvfree(fences);
}
-static struct drm_syncobj **
-get_fence_array(struct drm_i915_gem_execbuffer2 *args,
- struct drm_file *file)
+static struct i915_drm_dma_fences *
+get_timeline_fence_array(struct i915_execbuffer *eb, int *out_n_fences)
+{
+ struct drm_i915_gem_execbuffer_ext_timeline_fences *timeline_fences =
+ &eb->extensions.timeline_fences;
+ struct drm_i915_gem_exec_fence __user *user_fences;
+ struct i915_drm_dma_fences *fences;
+ u64 __user *user_values;
+ unsigned long n;
+ int err;
+
+ *out_n_fences = timeline_fences->handle_count;
+
+ /* Check multiplication overflow for access_ok() and kvmalloc_array() */
+ BUILD_BUG_ON(sizeof(size_t) > sizeof(unsigned long));
+ if (*out_n_fences > min_t(unsigned long,
+ ULONG_MAX / sizeof(*user_fences),
+ SIZE_MAX / sizeof(*fences)))
+ return ERR_PTR(-EINVAL);
+
+ user_fences = u64_to_user_ptr(timeline_fences->handles_ptr);
+ if (!access_ok(user_fences, *out_n_fences * sizeof(*user_fences)))
+ return ERR_PTR(-EFAULT);
+
+ user_values = u64_to_user_ptr(timeline_fences->values_ptr);
+ if (!access_ok(user_values, *out_n_fences * sizeof(*user_values)))
+ return ERR_PTR(-EFAULT);
+
+ fences = kvmalloc_array(*out_n_fences, sizeof(*fences),
+ __GFP_NOWARN | GFP_KERNEL);
+ if (!fences)
+ return ERR_PTR(-ENOMEM);
+
+ BUILD_BUG_ON(~(ARCH_KMALLOC_MINALIGN - 1) &
+ ~__I915_EXEC_FENCE_UNKNOWN_FLAGS);
+
+ for (n = 0; n < *out_n_fences; n++) {
+ struct drm_i915_gem_exec_fence user_fence;
+ struct drm_syncobj *syncobj;
+ struct dma_fence *fence = NULL;
+ u64 point;
+
+ if (__copy_from_user(&user_fence, user_fences++, sizeof(user_fence))) {
+ err = -EFAULT;
+ goto err;
+ }
+
+ if (user_fence.flags & __I915_EXEC_FENCE_UNKNOWN_FLAGS) {
+ err = -EINVAL;
+ goto err;
+ }
+
+ if (__get_user(point, user_values++)) {
+ err = -EFAULT;
+ goto err;
+ }
+
+ syncobj = drm_syncobj_find(eb->file, user_fence.handle);
+ if (!syncobj) {
+ DRM_DEBUG("Invalid syncobj handle provided\n");
+ err = -EINVAL;
+ goto err;
+ }
+
+ if (user_fence.flags & I915_EXEC_FENCE_WAIT) {
+ fence = drm_syncobj_fence_get(syncobj);
+ if (!fence) {
+ DRM_DEBUG("Syncobj handle has no fence\n");
+ drm_syncobj_put(syncobj);
+ err = -EINVAL;
+ goto err;
+ }
+
+ err = dma_fence_chain_find_seqno(&fence, point);
+ if (err) {
+ DRM_DEBUG("Syncobj handle missing requested point\n");
+ goto err;
+ }
+ }
+
+ /*
+ * For timeline syncobjs we need to create a chain.
+ */
+ if (point != 0 && user_fence.flags & I915_EXEC_FENCE_SIGNAL) {
+ fences[n].chain_fence =
+ kmalloc(sizeof(*fences[n].chain_fence),
+ GFP_KERNEL);
+ if (!fences[n].chain_fence) {
+ dma_fence_put(fence);
+ drm_syncobj_put(syncobj);
+ err = -ENOMEM;
+ DRM_DEBUG("Unable to alloc chain_fence\n");
+ goto err;
+ }
+ } else {
+ fences[n].chain_fence = NULL;
+ }
+
+ fences[n].syncobj = ptr_pack_bits(syncobj, user_fence.flags, 2);
+ fences[n].dma_fence = fence;
+ fences[n].value = point;
+ }
+
+ return fences;
+
+err:
+ __free_fence_array(fences, n);
+ return ERR_PTR(err);
+}
+
+static struct i915_drm_dma_fences *
+get_legacy_fence_array(struct i915_execbuffer *eb,
+ int *out_n_fences)
{
- const unsigned long nfences = args->num_cliprects;
+ struct drm_i915_gem_execbuffer2 *args = eb->args;
struct drm_i915_gem_exec_fence __user *user;
- struct drm_syncobj **fences;
+ struct i915_drm_dma_fences *fences;
unsigned long n;
int err;
- if (!(args->flags & I915_EXEC_FENCE_ARRAY))
- return NULL;
+ *out_n_fences = args->num_cliprects;
/* Check multiplication overflow for access_ok() and kvmalloc_array() */
BUILD_BUG_ON(sizeof(size_t) > sizeof(unsigned long));
- if (nfences > min_t(unsigned long,
- ULONG_MAX / sizeof(*user),
- SIZE_MAX / sizeof(*fences)))
+ if (*out_n_fences > min_t(unsigned long,
+ ULONG_MAX / sizeof(*user),
+ SIZE_MAX / sizeof(*fences)))
return ERR_PTR(-EINVAL);
user = u64_to_user_ptr(args->cliprects_ptr);
- if (!access_ok(user, nfences * sizeof(*user)))
+ if (!access_ok(user, *out_n_fences * sizeof(*user)))
return ERR_PTR(-EFAULT);
- fences = kvmalloc_array(nfences, sizeof(*fences),
+ fences = kvmalloc_array(*out_n_fences, sizeof(*fences),
__GFP_NOWARN | GFP_KERNEL);
if (!fences)
return ERR_PTR(-ENOMEM);
- for (n = 0; n < nfences; n++) {
- struct drm_i915_gem_exec_fence fence;
+ for (n = 0; n < *out_n_fences; n++) {
+ struct drm_i915_gem_exec_fence user_fence;
struct drm_syncobj *syncobj;
+ struct dma_fence *fence = NULL;
- if (__copy_from_user(&fence, user++, sizeof(fence))) {
+ if (__copy_from_user(&user_fence, user++, sizeof(user_fence))) {
err = -EFAULT;
goto err;
}
- if (fence.flags & __I915_EXEC_FENCE_UNKNOWN_FLAGS) {
+ if (user_fence.flags & __I915_EXEC_FENCE_UNKNOWN_FLAGS) {
err = -EINVAL;
goto err;
}
- syncobj = drm_syncobj_find(file, fence.handle);
+ syncobj = drm_syncobj_find(eb->file, user_fence.handle);
if (!syncobj) {
DRM_DEBUG("Invalid syncobj handle provided\n");
err = -ENOENT;
goto err;
}
+ if (user_fence.flags & I915_EXEC_FENCE_WAIT) {
+ fence = drm_syncobj_fence_get(syncobj);
+ if (!fence) {
+ DRM_DEBUG("Syncobj handle has no fence\n");
+ drm_syncobj_put(syncobj);
+ err = -EINVAL;
+ goto err;
+ }
+ }
+
BUILD_BUG_ON(~(ARCH_KMALLOC_MINALIGN - 1) &
~__I915_EXEC_FENCE_UNKNOWN_FLAGS);
- fences[n] = ptr_pack_bits(syncobj, fence.flags, 2);
+ fences[n].syncobj = ptr_pack_bits(syncobj, user_fence.flags, 2);
+ fences[n].dma_fence = fence;
+ fences[n].value = 0;
+ fences[n].chain_fence = NULL;
}
return fences;
@@ -2283,37 +2417,47 @@ get_fence_array(struct drm_i915_gem_execbuffer2 *args,
return ERR_PTR(err);
}
+static struct i915_drm_dma_fences *
+get_fence_array(struct i915_execbuffer *eb, int *out_n_fences)
+{
+ if (eb->args->flags & I915_EXEC_FENCE_ARRAY) {
+ /* Timeline fences are incompatible with the fence array. */
+ if (eb->extensions.flags & BIT(DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES))
+ return ERR_PTR(-EINVAL);
+
+ return get_legacy_fence_array(eb, out_n_fences);
+ } else if (eb->extensions.flags & BIT(DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES)) {
+ return get_timeline_fence_array(eb, out_n_fences);
+ }
+
+ return NULL;
+}
+
static void
-put_fence_array(struct drm_i915_gem_execbuffer2 *args,
- struct drm_syncobj **fences)
+put_fence_array(struct i915_drm_dma_fences *fences, int nfences)
{
if (fences)
- __free_fence_array(fences, args->num_cliprects);
+ __free_fence_array(fences, nfences);
}
static int
await_fence_array(struct i915_execbuffer *eb,
- struct drm_syncobj **fences)
+ struct i915_drm_dma_fences *fences,
+ int nfences)
{
- const unsigned int nfences = eb->args->num_cliprects;
unsigned int n;
int err;
for (n = 0; n < nfences; n++) {
struct drm_syncobj *syncobj;
- struct dma_fence *fence;
unsigned int flags;
- syncobj = ptr_unpack_bits(fences[n], &flags, 2);
+ syncobj = ptr_unpack_bits(fences[n].syncobj, &flags, 2);
if (!(flags & I915_EXEC_FENCE_WAIT))
continue;
- fence = drm_syncobj_fence_get(syncobj);
- if (!fence)
- return -EINVAL;
-
- err = i915_request_await_dma_fence(eb->request, fence);
- dma_fence_put(fence);
+ err = i915_request_await_dma_fence(eb->request,
+ fences[n].dma_fence);
if (err < 0)
return err;
}
@@ -2323,9 +2467,9 @@ await_fence_array(struct i915_execbuffer *eb,
static void
signal_fence_array(struct i915_execbuffer *eb,
- struct drm_syncobj **fences)
+ struct i915_drm_dma_fences *fences,
+ int nfences)
{
- const unsigned int nfences = eb->args->num_cliprects;
struct dma_fence * const fence = &eb->request->fence;
unsigned int n;
@@ -2333,15 +2477,39 @@ signal_fence_array(struct i915_execbuffer *eb,
struct drm_syncobj *syncobj;
unsigned int flags;
- syncobj = ptr_unpack_bits(fences[n], &flags, 2);
+ syncobj = ptr_unpack_bits(fences[n].syncobj, &flags, 2);
if (!(flags & I915_EXEC_FENCE_SIGNAL))
continue;
- drm_syncobj_replace_fence(syncobj, fence);
+ if (fences[n].chain_fence) {
+ drm_syncobj_add_point(syncobj, fences[n].chain_fence,
+ fence, fences[n].value);
+ /*
+ * The chain's ownership is transfered to the
+ * timeline.
+ */
+ fences[n].chain_fence = NULL;
+ } else {
+ drm_syncobj_replace_fence(syncobj, fence);
+ }
}
}
+static int parse_timeline_fences(struct i915_user_extension __user *ext, void *data)
+{
+ struct i915_execbuffer *eb = data;
+
+ if (copy_from_user(&eb->extensions.timeline_fences, ext,
+ sizeof(eb->extensions.timeline_fences)))
+ return -EFAULT;
+
+ eb->extensions.flags |= BIT(DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES);
+
+ return 0;
+}
+
static const i915_user_extension_fn execbuf_extensions[] = {
+ [DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES] = parse_timeline_fences,
};
static int
@@ -2361,14 +2529,15 @@ static int
i915_gem_do_execbuffer(struct drm_device *dev,
struct drm_file *file,
struct drm_i915_gem_execbuffer2 *args,
- struct drm_i915_gem_exec_object2 *exec,
- struct drm_syncobj **fences)
+ struct drm_i915_gem_exec_object2 *exec)
{
struct i915_execbuffer eb;
struct dma_fence *in_fence = NULL;
struct dma_fence *exec_fence = NULL;
struct sync_file *out_fence = NULL;
+ struct i915_drm_dma_fences *fences = NULL;
int out_fence_fd = -1;
+ int nfences = 0;
int err;
BUILD_BUG_ON(__EXEC_INTERNAL_FLAGS & ~__I915_EXEC_ILLEGAL_FLAGS);
@@ -2410,10 +2579,16 @@ i915_gem_do_execbuffer(struct drm_device *dev,
return err;
}
+ fences = get_fence_array(&eb, &nfences);
+ if (IS_ERR(fences))
+ return PTR_ERR(fences);
+
if (args->flags & I915_EXEC_FENCE_IN) {
in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));
- if (!in_fence)
- return -EINVAL;
+ if (!in_fence) {
+ err = -EINVAL;
+ goto err_fences;
+ }
}
if (args->flags & I915_EXEC_FENCE_SUBMIT) {
@@ -2571,7 +2746,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
}
if (fences) {
- err = await_fence_array(&eb, fences);
+ err = await_fence_array(&eb, fences, nfences);
if (err)
goto err_request;
}
@@ -2600,7 +2775,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
i915_request_add(eb.request);
if (fences)
- signal_fence_array(&eb, fences);
+ signal_fence_array(&eb, fences, nfences);
if (out_fence) {
if (err == 0) {
@@ -2635,6 +2810,8 @@ i915_gem_do_execbuffer(struct drm_device *dev,
dma_fence_put(exec_fence);
err_in_fence:
dma_fence_put(in_fence);
+err_fences:
+ put_fence_array(fences, nfences);
return err;
}
@@ -2728,7 +2905,7 @@ i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data,
exec2_list[i].flags = 0;
}
- err = i915_gem_do_execbuffer(dev, file, &exec2, exec2_list, NULL);
+ err = i915_gem_do_execbuffer(dev, file, &exec2, exec2_list);
if (exec2.flags & __EXEC_HAS_RELOC) {
struct drm_i915_gem_exec_object __user *user_exec_list =
u64_to_user_ptr(args->buffers_ptr);
@@ -2759,7 +2936,6 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,
{
struct drm_i915_gem_execbuffer2 *args = data;
struct drm_i915_gem_exec_object2 *exec2_list;
- struct drm_syncobj **fences = NULL;
const size_t count = args->buffer_count;
int err;
@@ -2787,15 +2963,7 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,
return -EFAULT;
}
- if (args->flags & I915_EXEC_FENCE_ARRAY) {
- fences = get_fence_array(args, file);
- if (IS_ERR(fences)) {
- kvfree(exec2_list);
- return PTR_ERR(fences);
- }
- }
-
- err = i915_gem_do_execbuffer(dev, file, args, exec2_list, fences);
+ err = i915_gem_do_execbuffer(dev, file, args, exec2_list);
/*
* Now that we have begun execution of the batchbuffer, we ignore
@@ -2835,7 +3003,6 @@ end:;
}
args->flags &= ~__I915_EXEC_UNKNOWN_FLAGS;
- put_fence_array(args, fences);
kvfree(exec2_list);
return err;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9ed4d0016ee1..a872791f98bd 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -448,6 +448,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,
case I915_PARAM_HAS_EXEC_BATCH_FIRST:
case I915_PARAM_HAS_EXEC_FENCE_ARRAY:
case I915_PARAM_HAS_EXEC_SUBMIT_FENCE:
+ case I915_PARAM_HAS_EXEC_TIMELINE_FENCES:
/* For the time being all of these are always true;
* if some supported hardware does not have one of these
* features this value needs to be provided from
@@ -3192,7 +3193,8 @@ static struct drm_driver driver = {
*/
.driver_features =
DRIVER_GEM | DRIVER_PRIME |
- DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ,
+ DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ |
+ DRIVER_SYNCOBJ_TIMELINE,
.release = i915_driver_release,
.open = i915_driver_open,
.lastclose = i915_driver_lastclose,
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index efa195d6994e..b7fe1915e34d 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -617,6 +617,12 @@ typedef struct drm_i915_irq_wait {
*/
#define I915_PARAM_PERF_REVISION 54
+/* Query whether DRM_I915_GEM_EXECBUFFER2 supports supplying an array of
+ * timeline syncobj through drm_i915_gem_execbuf_ext_timeline_fences. See
+ * I915_EXEC_EXT.
+ */
+#define I915_PARAM_HAS_EXEC_TIMELINE_FENCES 55
+
/* Must be kept compact -- no holes and well documented */
typedef struct drm_i915_getparam {
@@ -1014,9 +1020,40 @@ struct drm_i915_gem_exec_fence {
};
enum drm_i915_gem_execbuffer_ext {
+ /**
+ * This identifier is associated with
+ * drm_i915_gem_execbuf_ext_timeline_fences.
+ */
+ DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES,
+
DRM_I915_GEM_EXECBUFFER_EXT_MAX /* non-ABI */
};
+/**
+ * This structure describes an array of drm_syncobj and associated points for
+ * timeline variants of drm_syncobj. It is invalid to append this structure to
+ * the execbuf if I915_EXEC_FENCE_ARRAY is set.
+ */
+struct drm_i915_gem_execbuffer_ext_timeline_fences {
+ struct i915_user_extension base;
+
+ /**
+ * Number of element in the handles_ptr & value_ptr arrays.
+ */
+ __u64 handle_count;
+
+ /**
+ * Pointer to an array of struct drm_i915_gem_exec_fence of size handle_count.
+ */
+ __u64 handles_ptr;
+
+ /**
+ * Pointer to an array of u64 values of size handle_count. Values must
+ * be 0 for a binary drm_syncobj.
+ */
+ __u64 values_ptr;
+};
+
struct drm_i915_gem_execbuffer2 {
/**
* List of gem_exec_object2 structs
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 5/7] drm/i915: add a new perf configuration execbuf parameter
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (3 preceding siblings ...)
2019-06-05 13:38 ` [PATCH v4 4/7] drm/i915: add syncobj timeline support Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 6/7] drm/i915/perf: allow holding preemption on filtered ctx Lionel Landwerlin
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
We want the ability to dispatch a set of command buffer to the
hardware, each with a different OA configuration. To achieve this, we
reuse a couple of fields from the execbuf2 struct (I CAN HAZ
execbuf3?) to notify what OA configuration should be used for a batch
buffer. This requires the process making the execbuf with this flag to
also own the perf fd at the time of execbuf.
v2: Add a emit_oa_config() vfunc in the intel_engine_cs (Chris)
Move oa_config vma to active (Chris)
v3: Don't drop the lock for engine lookup (Chris)
Move OA config vma to active before writing the ringbuffer (Chris)
v4: Reuse i915_user_extension_fn
Serialize requests with OA config updates
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 130 +++++++++++++++++-
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +
drivers/gpu/drm/i915/gt/intel_engine_types.h | 9 ++
drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 4 +
drivers/gpu/drm/i915/i915_drv.h | 10 +-
drivers/gpu/drm/i915/i915_perf.c | 26 ++--
include/uapi/drm/i915_drm.h | 37 +++++
9 files changed, 208 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 86864ec76a8b..dc7e765edf4b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -281,7 +281,11 @@ struct i915_execbuffer {
struct {
u64 flags; /** Available extensions parameters */
struct drm_i915_gem_execbuffer_ext_timeline_fences timeline_fences;
+ struct drm_i915_gem_execbuffer_ext_perf perf_config;
} extensions;
+
+ struct i915_oa_config *oa_config; /** HW configuration for OA, NULL is not needed. */
+ struct drm_i915_gem_object *oa_bo;
};
#define exec_entry(EB, VMA) (&(EB)->exec[(VMA)->exec_flags - (EB)->flags])
@@ -1199,6 +1203,34 @@ static int reloc_move_to_gpu(struct i915_request *rq, struct i915_vma *vma)
return err;
}
+
+static int
+get_execbuf_oa_config(struct drm_i915_private *dev_priv,
+ s32 perf_fd, u64 oa_config_id,
+ struct i915_oa_config **out_oa_config,
+ struct drm_i915_gem_object **out_oa_obj)
+{
+ struct file *perf_file;
+ int ret;
+
+ if (!dev_priv->perf.oa.exclusive_stream)
+ return -EINVAL;
+
+ perf_file = fget(perf_fd);
+ if (!perf_file)
+ return -EINVAL;
+
+ if (perf_file->private_data != dev_priv->perf.oa.exclusive_stream)
+ return -EINVAL;
+
+ fput(perf_file);
+
+ ret = i915_perf_get_oa_config(dev_priv, oa_config_id,
+ out_oa_config, out_oa_obj);
+
+ return ret;
+}
+
static int __reloc_gpu_alloc(struct i915_execbuffer *eb,
struct i915_vma *vma,
unsigned int len)
@@ -2061,6 +2093,64 @@ add_to_client(struct i915_request *rq, struct drm_file *file)
list_add_tail(&rq->client_link, &rq->file_priv->mm.request_list);
}
+static int eb_oa_config(struct i915_execbuffer *eb)
+{
+ struct i915_vma *oa_vma;
+ int err;
+
+ if (!eb->oa_config)
+ return 0;
+
+ err = i915_active_request_set(&eb->engine->last_oa_config,
+ eb->request);
+ if (err)
+ return err;
+
+ /*
+ * If the perf stream was opened with hold preemption, flag the
+ * request properly so that the priority of the request is bumped once
+ * it reaches the execlist ports.
+ */
+ if (eb->i915->perf.oa.exclusive_stream->hold_preemption)
+ eb->request->has_perf = true;
+
+ /*
+ * If the config hasn't changed, skip reconfiguring the HW (this is
+ * subject to a delay we want to avoid has much as possible).
+ */
+ if (eb->oa_config == eb->i915->perf.oa.exclusive_stream->oa_config)
+ return 0;
+
+ oa_vma = i915_vma_instance(eb->oa_bo,
+ &eb->engine->i915->ggtt.vm, NULL);
+ if (unlikely(IS_ERR(oa_vma)))
+ return PTR_ERR(oa_vma);
+
+ err = i915_vma_pin(oa_vma, 0, 0, PIN_GLOBAL);
+ if (err)
+ return err;
+
+ err = i915_vma_move_to_active(oa_vma, eb->request, 0);
+ if (err) {
+ i915_vma_unpin(oa_vma);
+ return err;
+ }
+
+ err = eb->engine->emit_bb_start(eb->request,
+ oa_vma->node.start,
+ 0, I915_DISPATCH_SECURE);
+ if (err) {
+ i915_vma_unpin(oa_vma);
+ return err;
+ }
+
+ i915_vma_unpin(oa_vma);
+
+ swap(eb->oa_config, eb->i915->perf.oa.exclusive_stream->oa_config);
+
+ return 0;
+}
+
static int eb_submit(struct i915_execbuffer *eb)
{
int err;
@@ -2087,6 +2177,10 @@ static int eb_submit(struct i915_execbuffer *eb)
return err;
}
+ err = eb_oa_config(eb);
+ if (err)
+ return err;
+
err = eb->engine->emit_bb_start(eb->request,
eb->batch->node.start +
eb->batch_start_offset,
@@ -2508,8 +2602,22 @@ static int parse_timeline_fences(struct i915_user_extension __user *ext, void *d
return 0;
}
+static int parse_perf_config(struct i915_user_extension __user *ext, void *data)
+{
+ struct i915_execbuffer *eb = data;
+
+ if (copy_from_user(&eb->extensions.perf_config, ext,
+ sizeof(eb->extensions.perf_config)))
+ return -EFAULT;
+
+ eb->extensions.flags |= BIT(DRM_I915_GEM_EXECBUFFER_EXT_PERF);
+
+ return 0;
+}
+
static const i915_user_extension_fn execbuf_extensions[] = {
[DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES] = parse_timeline_fences,
+ [DRM_I915_GEM_EXECBUFFER_EXT_PERF] = parse_perf_config,
};
static int
@@ -2561,6 +2669,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
eb.buffer_count = args->buffer_count;
eb.batch_start_offset = args->batch_start_offset;
eb.batch_len = args->batch_len;
+ eb.oa_config = NULL;
eb.batch_flags = 0;
if (args->flags & I915_EXEC_SECURE) {
@@ -2639,9 +2748,23 @@ i915_gem_do_execbuffer(struct drm_device *dev,
if (unlikely(err))
goto err_unlock;
+ if (eb.extensions.flags & BIT(DRM_I915_GEM_EXECBUFFER_EXT_PERF)) {
+ if (!intel_engine_has_oa(eb.engine)) {
+ err = -ENODEV;
+ goto err_engine;
+ }
+
+ err = get_execbuf_oa_config(eb.i915,
+ eb.extensions.perf_config.perf_fd,
+ eb.extensions.perf_config.oa_config,
+ &eb.oa_config, &eb.oa_bo);
+ if (err)
+ goto err_engine;
+ }
+
err = eb_wait_for_ring(&eb); /* may temporarily drop struct_mutex */
if (unlikely(err))
- goto err_engine;
+ goto err_oa;
err = eb_relocate(&eb);
if (err) {
@@ -2794,6 +2917,11 @@ i915_gem_do_execbuffer(struct drm_device *dev,
err_vma:
if (eb.exec)
eb_release_vmas(&eb);
+err_oa:
+ if (eb.oa_config) {
+ i915_gem_object_put(eb.oa_bo);
+ i915_oa_config_put(eb.oa_config);
+ }
err_engine:
eb_unpin_context(&eb);
err_unlock:
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 6b838948ba24..7b2e81c7930d 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -840,6 +840,8 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
engine->set_default_submission(engine);
+ INIT_ACTIVE_REQUEST(&engine->last_oa_config);
+
return 0;
err_unpin:
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index 01223864237a..0210a905e636 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -363,6 +363,8 @@ struct intel_engine_cs {
struct i915_wa_list wa_list;
struct i915_wa_list whitelist;
+ struct i915_active_request last_oa_config;
+
u32 irq_keep_mask; /* always keep these interrupts */
u32 irq_enable_mask; /* bitmask to enable ring interrupt */
void (*irq_enable)(struct intel_engine_cs *engine);
@@ -457,6 +459,7 @@ struct intel_engine_cs {
#define I915_ENGINE_HAS_SEMAPHORES BIT(3)
#define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(4)
#define I915_ENGINE_IS_VIRTUAL BIT(5)
+#define I915_ENGINE_HAS_OA BIT(6)
unsigned int flags;
/*
@@ -552,6 +555,12 @@ intel_engine_is_virtual(const struct intel_engine_cs *engine)
return engine->flags & I915_ENGINE_IS_VIRTUAL;
}
+static inline bool
+intel_engine_has_oa(const struct intel_engine_cs *engine)
+{
+ return engine->flags & I915_ENGINE_HAS_OA;
+}
+
#define instdone_slice_mask(dev_priv__) \
(IS_GEN(dev_priv__, 7) ? \
1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index fed704802c57..ed19f4e53d31 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2732,6 +2732,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)
engine->init_context = gen8_init_rcs_context;
engine->emit_flush = gen8_emit_flush_render;
engine->emit_fini_breadcrumb = gen8_emit_fini_breadcrumb_rcs;
+ engine->flags |= I915_ENGINE_HAS_OA;
}
return 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
index ff58d658e3e2..972193cfbf41 100644
--- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -2212,8 +2212,10 @@ static void setup_rcs(struct intel_engine_cs *engine)
engine->irq_enable_mask = I915_USER_INTERRUPT;
}
- if (IS_HASWELL(i915))
+ if (IS_HASWELL(i915)) {
engine->emit_bb_start = hsw_emit_bb_start;
+ engine->flags |= I915_ENGINE_HAS_OA;
+ }
engine->resume = rcs_resume;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a872791f98bd..75029d1a3802 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -478,6 +478,10 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,
case I915_PARAM_PERF_REVISION:
value = 1;
break;
+ case I915_PARAM_HAS_EXEC_PERF_CONFIG:
+ /* Obviously requires perf support. */
+ value = dev_priv->perf.initialized;
+ break;
default:
DRM_DEBUG("Unknown parameter %d\n", param->param);
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 83a32e9d86b5..7b82bb85e45d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1156,6 +1156,8 @@ struct i915_oa_reg {
};
struct i915_oa_config {
+ struct drm_i915_private *i915;
+
char uuid[UUID_STRING_LEN + 1];
int id;
@@ -1174,7 +1176,7 @@ struct i915_oa_config {
struct list_head vma_link;
- atomic_t ref_count;
+ struct kref ref;
};
struct i915_perf_stream;
@@ -2727,6 +2729,12 @@ int i915_perf_get_oa_config(struct drm_i915_private *i915,
int metrics_set,
struct i915_oa_config **out_config,
struct drm_i915_gem_object **out_obj);
+void i915_oa_config_release(struct kref *ref);
+
+static inline void i915_oa_config_put(struct i915_oa_config *oa_config)
+{
+ kref_put(&oa_config->ref, i915_oa_config_release);
+}
/* i915_gem_evict.c */
int __must_check i915_gem_evict_something(struct i915_address_space *vm,
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index e0071e44de3d..4e69266bba61 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -366,10 +366,11 @@ struct perf_open_properties {
int oa_period_exponent;
};
-static void put_oa_config(struct i915_oa_config *oa_config)
+void i915_oa_config_release(struct kref *ref)
{
- if (!atomic_dec_and_test(&oa_config->ref_count))
- return;
+ struct i915_oa_config *oa_config = container_of(ref, typeof(*oa_config), ref);
+
+ lockdep_assert_held(&oa_config->i915->perf.metrics_lock);
if (oa_config->obj) {
list_del(&oa_config->vma_link);
@@ -478,7 +479,7 @@ int i915_perf_get_oa_config(struct drm_i915_private *i915,
}
if (out_config) {
- atomic_inc(&oa_config->ref_count);
+ kref_get(&oa_config->ref);
*out_config = oa_config;
}
@@ -500,7 +501,7 @@ int i915_perf_get_oa_config(struct drm_i915_private *i915,
err_buf_alloc:
if (out_config) {
- put_oa_config(oa_config);
+ i915_oa_config_put(oa_config);
*out_config = NULL;
}
unlock:
@@ -1475,7 +1476,7 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)
if (stream->ctx)
oa_put_render_ctx_id(stream);
- put_oa_config(stream->oa_config);
+ i915_oa_config_put(stream->oa_config);
if (dev_priv->perf.oa.spurious_report_rs.missed) {
DRM_NOTE("%d spurious OA report notices suppressed due to ratelimiting\n",
@@ -2243,7 +2244,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
free_oa_buffer(dev_priv);
err_oa_buf_alloc:
- put_oa_config(stream->oa_config);
+ i915_oa_config_put(stream->oa_config);
intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);
intel_runtime_pm_put(dev_priv, stream->wakeref);
@@ -3052,7 +3053,7 @@ void i915_perf_register(struct drm_i915_private *dev_priv)
if (ret)
goto sysfs_error;
- atomic_set(&dev_priv->perf.oa.test_config.ref_count, 1);
+ dev_priv->perf.oa.test_config.i915 = dev_priv;
goto exit;
@@ -3307,7 +3308,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
return -ENOMEM;
}
- atomic_set(&oa_config->ref_count, 1);
+ oa_config->i915 = dev_priv;
+ kref_init(&oa_config->ref);
if (!uuid_is_valid(args->uuid)) {
DRM_DEBUG("Invalid uuid format for OA config\n");
@@ -3406,7 +3408,7 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
sysfs_err:
mutex_unlock(&dev_priv->perf.metrics_lock);
reg_err:
- put_oa_config(oa_config);
+ i915_oa_config_put(oa_config);
DRM_DEBUG("Failed to add new OA config\n");
return err;
}
@@ -3460,7 +3462,7 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
DRM_DEBUG("Removed config %s id=%i\n", oa_config->uuid, oa_config->id);
- put_oa_config(oa_config);
+ i915_oa_config_put(oa_config);
config_err:
mutex_unlock(&dev_priv->perf.metrics_lock);
@@ -3622,7 +3624,7 @@ static int destroy_config(int id, void *p, void *data)
{
struct i915_oa_config *oa_config = p;
- put_oa_config(oa_config);
+ i915_oa_config_put(oa_config);
return 0;
}
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index b7fe1915e34d..5938a73963fe 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -623,6 +623,16 @@ typedef struct drm_i915_irq_wait {
*/
#define I915_PARAM_HAS_EXEC_TIMELINE_FENCES 55
+/*
+ * Request an i915/perf performance configuration change before running the
+ * commands given in an execbuf.
+ *
+ * Performance configuration ID and the file descriptor of the i915 perf
+ * stream are given through drm_i915_gem_execbuffer_ext_perf. See
+ * I915_EXEC_EXT.
+ */
+#define I915_PARAM_HAS_EXEC_PERF_CONFIG 56
+
/* Must be kept compact -- no holes and well documented */
typedef struct drm_i915_getparam {
@@ -1026,6 +1036,12 @@ enum drm_i915_gem_execbuffer_ext {
*/
DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES,
+ /**
+ * This identifier is associated with
+ * drm_i915_gem_execbuffer_perf_ext.
+ */
+ DRM_I915_GEM_EXECBUFFER_EXT_PERF,
+
DRM_I915_GEM_EXECBUFFER_EXT_MAX /* non-ABI */
};
@@ -1054,6 +1070,27 @@ struct drm_i915_gem_execbuffer_ext_timeline_fences {
__u64 values_ptr;
};
+struct drm_i915_gem_execbuffer_ext_perf {
+ struct i915_user_extension base;
+
+ /**
+ * Performance file descriptor returned by DRM_IOCTL_I915_PERF_OPEN.
+ * This is used to identify that the application
+ */
+ __s32 perf_fd;
+
+ /**
+ * Unused for now. Must be cleared to zero.
+ */
+ __u32 pad;
+
+ /**
+ * OA configuration ID to switch to before executing the commands
+ * associated to the execbuf.
+ */
+ __u64 oa_config;
+};
+
struct drm_i915_gem_execbuffer2 {
/**
* List of gem_exec_object2 structs
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 6/7] drm/i915/perf: allow holding preemption on filtered ctx
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (4 preceding siblings ...)
2019-06-05 13:38 ` [PATCH v4 5/7] drm/i915: add a new perf configuration execbuf parameter Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 13:38 ` [PATCH v4 7/7] drm/i915: add support for perf configuration queries Lionel Landwerlin
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
We would like to make use of perf in Vulkan. The Vulkan API is much
lower level than OpenGL, with applications directly exposed to the
concept of command buffers (pretty much equivalent to our batch
buffers). In Vulkan, queries are always limited in scope to a command
buffer. In OpenGL, the lack of command buffer concept meant that
queries' duration could span multiple command buffers.
With that restriction gone in Vulkan, we would like to simplify
measuring performance just by measuring the deltas between the counter
snapshots written by 2 MI_RECORD_PERF_COUNT commands, rather than the
more complex scheme we currently have in the GL driver, using 2
MI_RECORD_PERF_COUNT commands and doing some post processing on the
stream of OA reports, coming from the global OA buffer, to remove any
unrelated deltas in between the 2 MI_RECORD_PERF_COUNT.
Disabling preemption only apply to a single context with which want to
query performance counters for and is considered a privileged
operation, by default protected by CAP_SYS_ADMIN. It is possible to
enable it for a normal user by disabling the paranoid stream setting.
v2: Store preemption setting in intel_context (Chris)
v3: Use priorities to avoid preemption rather than the HW mechanism
v4: Just modify the port priority reporting function
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/gt/intel_lrc.c | 7 ++++++-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 13 ++++++++++++
drivers/gpu/drm/i915/i915_perf.c | 22 +++++++++++++++++++--
drivers/gpu/drm/i915/i915_priolist_types.h | 7 +++++++
drivers/gpu/drm/i915/i915_request.c | 1 +
drivers/gpu/drm/i915/i915_request.h | 1 +
drivers/gpu/drm/i915/intel_guc_submission.c | 10 +++++++++-
include/uapi/drm/i915_drm.h | 11 +++++++++++
9 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index ed19f4e53d31..b32b04b268eb 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -233,7 +233,12 @@ static inline int rq_prio(const struct i915_request *rq)
static int effective_prio(const struct i915_request *rq)
{
- int prio = rq_prio(rq);
+ int prio;
+
+ if (rq->has_perf)
+ prio = I915_USER_PRIORITY(I915_PRIORITY_PERF);
+ else
+ prio = rq_prio(rq);
/*
* On unwinding the active request, we give it a priority bump
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 75029d1a3802..984b76a09cfa 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -476,7 +476,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,
value = INTEL_INFO(dev_priv)->has_coherent_ggtt;
break;
case I915_PARAM_PERF_REVISION:
- value = 1;
+ value = 2;
break;
case I915_PARAM_HAS_EXEC_PERF_CONFIG:
/* Obviously requires perf support. */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7b82bb85e45d..1cb41f398c05 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1292,6 +1292,19 @@ struct i915_perf_stream {
*/
bool enabled;
+ /**
+ * @hold_preemption: Whether preemption is put on hold for command
+ * submissions done on the @ctx. This is useful for some drivers that
+ * cannot easily post process the OA buffer context to subtract delta
+ * of performance counters not associated with @ctx.
+ */
+ bool hold_preemption;
+
+ /**
+ * @last_config_request
+ */
+ struct i915_request *last_config_request;
+
/**
* @ops: The callbacks providing the implementation of this specific
* type of configured stream.
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 4e69266bba61..0755746d416e 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -343,6 +343,8 @@ static const struct i915_oa_format gen8_plus_oa_formats[I915_OA_FORMAT_MAX] = {
* struct perf_open_properties - for validated properties given to open a stream
* @sample_flags: `DRM_I915_PERF_PROP_SAMPLE_*` properties are tracked as flags
* @single_context: Whether a single or all gpu contexts should be monitored
+ * @hold_preemption: Whether the preemption is disabled for the filtered
+ * context
* @ctx_handle: A gem ctx handle for use with @single_context
* @metrics_set: An ID for an OA unit metric set advertised via sysfs
* @oa_format: An OA unit HW report format
@@ -357,6 +359,7 @@ struct perf_open_properties {
u32 sample_flags;
u64 single_context:1;
+ u64 hold_preemption:1;
u64 ctx_handle;
/* OA sampling state */
@@ -2171,6 +2174,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
stream->sample_flags |= SAMPLE_OA_REPORT;
stream->sample_size += format_size;
+ stream->hold_preemption = props->hold_preemption;
+
dev_priv->perf.oa.oa_buffer.format_size = format_size;
if (WARN_ON(dev_priv->perf.oa.oa_buffer.format_size == 0))
return -EINVAL;
@@ -2696,6 +2701,15 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv,
}
}
+ if (props->hold_preemption) {
+ if (!props->single_context) {
+ DRM_DEBUG("preemption disable with no context\n");
+ ret = -EINVAL;
+ goto err;
+ }
+ privileged_op = true;
+ }
+
/*
* On Haswell the OA unit supports clock gating off for a specific
* context and in this mode there's no visibility of metrics for the
@@ -2710,8 +2724,9 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv,
* MI_REPORT_PERF_COUNT commands and so consider it a privileged op to
* enable the OA unit by default.
*/
- if (IS_HASWELL(dev_priv) && specific_ctx)
+ if (IS_HASWELL(dev_priv) && specific_ctx && !props->hold_preemption) {
privileged_op = false;
+ }
/* Similar to perf's kernel.perf_paranoid_cpu sysctl option
* we check a dev.i915.perf_stream_paranoid sysctl option
@@ -2720,7 +2735,7 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv,
*/
if (privileged_op &&
i915_perf_stream_paranoid && !capable(CAP_SYS_ADMIN)) {
- DRM_DEBUG("Insufficient privileges to open system-wide i915 perf stream\n");
+ DRM_DEBUG("Insufficient privileges to open i915 perf stream\n");
ret = -EACCES;
goto err_ctx;
}
@@ -2912,6 +2927,9 @@ static int read_properties_unlocked(struct drm_i915_private *dev_priv,
props->oa_periodic = true;
props->oa_period_exponent = value;
break;
+ case DRM_I915_PERF_PROP_HOLD_PREEMPTION:
+ props->hold_preemption = value != 0 ? 1 : 0;
+ break;
case DRM_I915_PERF_PROP_MAX:
MISSING_CASE(id);
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/i915_priolist_types.h b/drivers/gpu/drm/i915/i915_priolist_types.h
index 49709de69875..fc1c1fe7ce58 100644
--- a/drivers/gpu/drm/i915/i915_priolist_types.h
+++ b/drivers/gpu/drm/i915/i915_priolist_types.h
@@ -17,6 +17,13 @@ enum {
I915_PRIORITY_NORMAL = I915_CONTEXT_DEFAULT_PRIORITY,
I915_PRIORITY_MAX = I915_CONTEXT_MAX_USER_PRIORITY + 1,
+ /* Requests containing performance queries must not be preempted by
+ * another context. They get scheduled with their default priority and
+ * once they reach the execlist ports we bump them to
+ * I915_PRIORITY_PERF so that they stick to the HW until they finish.
+ */
+ I915_PRIORITY_PERF = I915_CONTEXT_MAX_USER_PRIORITY + 2,
+
I915_PRIORITY_INVALID = INT_MIN
};
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index da1e6984a8cc..48dbe988db23 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -725,6 +725,7 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp)
rq->batch = NULL;
rq->capture_list = NULL;
rq->waitboost = false;
+ rq->has_perf = false;
rq->execution_mask = ALL_ENGINES;
INIT_LIST_HEAD(&rq->active_list);
diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h
index c9f7d07991c8..ab09b5bb89f7 100644
--- a/drivers/gpu/drm/i915/i915_request.h
+++ b/drivers/gpu/drm/i915/i915_request.h
@@ -216,6 +216,7 @@ struct i915_request {
unsigned long emitted_jiffies;
bool waitboost;
+ bool has_perf;
/** engine->request_list entry for this request */
struct list_head link;
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index a4f98ccef0fe..e56b39e5e394 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -727,7 +727,15 @@ static inline int rq_prio(const struct i915_request *rq)
static inline int port_prio(const struct execlist_port *port)
{
- return rq_prio(port_request(port)) | __NO_PREEMPTION;
+ const struct i915_request *rq = port_request(port);
+ int prio;
+
+ if (rq->has_perf)
+ prio = I915_USER_PRIORITY(I915_PRIORITY_PERF);
+ else
+ prio = rq_prio(rq);
+
+ return prio | __NO_PREEMPTION;
}
static bool __guc_dequeue(struct intel_engine_cs *engine)
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 5938a73963fe..e3c6c72193ed 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1982,6 +1982,17 @@ enum drm_i915_perf_property_id {
*/
DRM_I915_PERF_PROP_OA_EXPONENT,
+ /**
+ * Specifying this property is only valid when specify a context to
+ * filter with DRM_I915_PERF_PROP_CTX_HANDLE. Specifying this property
+ * will hold preemption of the particular context we want to gather
+ * performance data about. The execbuf2 submissions must include a
+ * drm_i915_gem_execbuffer_ext_perf parameter for this to apply.
+ *
+ * This property is available in perf revision 2.
+ */
+ DRM_I915_PERF_PROP_HOLD_PREEMPTION,
+
DRM_I915_PERF_PROP_MAX /* non-ABI */
};
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v4 7/7] drm/i915: add support for perf configuration queries
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (5 preceding siblings ...)
2019-06-05 13:38 ` [PATCH v4 6/7] drm/i915/perf: allow holding preemption on filtered ctx Lionel Landwerlin
@ 2019-06-05 13:38 ` Lionel Landwerlin
2019-06-05 15:19 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Vulkan performance query support (rev4) Patchwork
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Lionel Landwerlin @ 2019-06-05 13:38 UTC (permalink / raw)
To: intel-gfx
Listing configurations at the moment is supported only through sysfs.
This might cause issues for applications wanting to list
configurations from a container where sysfs isn't available.
This change adds a way to query the number of configurations and their
content through the i915 query uAPI.
v2: Fix sparse warnings (Lionel)
Add support to query configuration using uuid (Lionel)
v3: Fix some inconsistency in uapi header (Lionel)
Fix unlocking when not locked issue (Lionel)
Add debug messages (Lionel)
v4: Fix missing unlock (Dan)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 6 +
drivers/gpu/drm/i915/i915_perf.c | 4 +
drivers/gpu/drm/i915/i915_query.c | 279 ++++++++++++++++++++++++++++++
include/uapi/drm/i915_drm.h | 62 ++++++-
4 files changed, 350 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1cb41f398c05..eb34d7cb857e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1793,6 +1793,12 @@ struct drm_i915_private {
*/
struct list_head metrics_buffers;
+ /*
+ * Number of dynamic configurations, you need to hold
+ * dev_priv->perf.metrics_lock to access it.
+ */
+ u32 n_metrics;
+
/*
* Lock associated with anything below within this structure
* except exclusive_stream.
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 0755746d416e..4a767087de27 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -3417,6 +3417,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
goto sysfs_err;
}
+ dev_priv->perf.n_metrics++;
+
mutex_unlock(&dev_priv->perf.metrics_lock);
DRM_DEBUG("Added config %s id=%i\n", oa_config->uuid, oa_config->id);
@@ -3478,6 +3480,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
idr_remove(&dev_priv->perf.metrics_idr, *arg);
+ dev_priv->perf.n_metrics--;
+
DRM_DEBUG("Removed config %s id=%i\n", oa_config->uuid, oa_config->id);
i915_oa_config_put(oa_config);
diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
index 7b7016171057..c1e203c7b2c2 100644
--- a/drivers/gpu/drm/i915/i915_query.c
+++ b/drivers/gpu/drm/i915/i915_query.c
@@ -143,10 +143,289 @@ query_engine_info(struct drm_i915_private *i915,
return len;
}
+static int can_copy_perf_config_registers_or_number(u32 user_n_regs,
+ u64 user_regs_ptr,
+ u32 kernel_n_regs)
+{
+ /*
+ * We'll just put the number of registers, and won't copy the
+ * register.
+ */
+ if (user_n_regs == 0)
+ return 0;
+
+ if (user_n_regs < kernel_n_regs)
+ return -EINVAL;
+
+ if (!access_ok(u64_to_user_ptr(user_regs_ptr),
+ 2 * sizeof(u32) * kernel_n_regs))
+ return -EFAULT;
+
+ return 0;
+}
+
+static int copy_perf_config_registers_or_number(const struct i915_oa_reg *kernel_regs,
+ u32 kernel_n_regs,
+ u64 user_regs_ptr,
+ u32 *user_n_regs)
+{
+ u32 r;
+
+ if (*user_n_regs == 0) {
+ *user_n_regs = kernel_n_regs;
+ return 0;
+ }
+
+ *user_n_regs = kernel_n_regs;
+
+ for (r = 0; r < kernel_n_regs; r++) {
+ u32 __user *user_reg_ptr =
+ u64_to_user_ptr(user_regs_ptr + sizeof(u32) * r * 2);
+ u32 __user *user_val_ptr =
+ u64_to_user_ptr(user_regs_ptr + sizeof(u32) * r * 2 +
+ sizeof(u32));
+ int ret;
+
+ ret = __put_user(i915_mmio_reg_offset(kernel_regs[r].addr),
+ user_reg_ptr);
+ if (ret)
+ return -EFAULT;
+
+ ret = __put_user(kernel_regs[r].value, user_val_ptr);
+ if (ret)
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int query_perf_config_data(struct drm_i915_private *i915,
+ struct drm_i915_query_item *query_item,
+ bool use_uuid)
+{
+ struct drm_i915_query_perf_config __user *user_query_config_ptr =
+ u64_to_user_ptr(query_item->data_ptr);
+ struct drm_i915_perf_oa_config __user *user_config_ptr =
+ u64_to_user_ptr(query_item->data_ptr +
+ sizeof(struct drm_i915_query_perf_config));
+ struct drm_i915_perf_oa_config user_config;
+ struct i915_oa_config *oa_config = NULL;
+ u32 flags, total_size;
+ int ret;
+
+ if (!i915->perf.initialized)
+ return -ENODEV;
+
+ total_size = sizeof(struct drm_i915_query_perf_config) +
+ sizeof(struct drm_i915_perf_oa_config);
+
+ if (query_item->length == 0)
+ return total_size;
+
+ if (query_item->length < total_size) {
+ DRM_DEBUG("Invalid query config data item size=%u expected=%u\n",
+ query_item->length, total_size);
+ return -EINVAL;
+ }
+
+ if (!access_ok(user_query_config_ptr, total_size))
+ return -EFAULT;
+
+ if (__get_user(flags, &user_query_config_ptr->flags))
+ return -EFAULT;
+
+ if (flags != 0)
+ return -EINVAL;
+
+ ret = mutex_lock_interruptible(&i915->perf.metrics_lock);
+ if (ret)
+ return ret;
+
+ if (use_uuid) {
+ char uuid[UUID_STRING_LEN + 1] = { 0, };
+ struct i915_oa_config *tmp;
+ int id;
+
+ BUILD_BUG_ON(sizeof(user_query_config_ptr->uuid) >= sizeof(uuid));
+
+ if (__copy_from_user(uuid, user_query_config_ptr->uuid,
+ sizeof(user_query_config_ptr->uuid))) {
+ ret = -EFAULT;
+ goto out;
+ }
+
+ idr_for_each_entry(&i915->perf.metrics_idr, tmp, id) {
+ if (!strcmp(tmp->uuid, uuid)) {
+ oa_config = tmp;
+ break;
+ }
+ }
+ } else {
+ u64 config_id;
+
+ if (__get_user(config_id, &user_query_config_ptr->config)) {
+ ret = -EFAULT;
+ goto out;
+ }
+
+ if (config_id == 1)
+ oa_config = &i915->perf.oa.test_config;
+ else
+ oa_config = idr_find(&i915->perf.metrics_idr, config_id);
+ }
+
+ if (!oa_config) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ if (__copy_from_user(&user_config, user_config_ptr,
+ sizeof(user_config))) {
+ ret = -EFAULT;
+ goto out;
+ }
+
+ ret = can_copy_perf_config_registers_or_number(user_config.n_boolean_regs,
+ user_config.boolean_regs_ptr,
+ oa_config->b_counter_regs_len);
+ if (ret)
+ goto out;
+
+ ret = can_copy_perf_config_registers_or_number(user_config.n_flex_regs,
+ user_config.flex_regs_ptr,
+ oa_config->flex_regs_len);
+ if (ret)
+ goto out;
+
+ ret = can_copy_perf_config_registers_or_number(user_config.n_mux_regs,
+ user_config.mux_regs_ptr,
+ oa_config->mux_regs_len);
+ if (ret)
+ goto out;
+
+ ret = copy_perf_config_registers_or_number(oa_config->b_counter_regs,
+ oa_config->b_counter_regs_len,
+ user_config.boolean_regs_ptr,
+ &user_config.n_boolean_regs);
+ if (ret)
+ goto out;
+
+ ret = copy_perf_config_registers_or_number(oa_config->flex_regs,
+ oa_config->flex_regs_len,
+ user_config.flex_regs_ptr,
+ &user_config.n_flex_regs);
+ if (ret)
+ goto out;
+
+ ret = copy_perf_config_registers_or_number(oa_config->mux_regs,
+ oa_config->mux_regs_len,
+ user_config.mux_regs_ptr,
+ &user_config.n_mux_regs);
+ if (ret)
+ goto out;
+
+ memcpy(user_config.uuid, oa_config->uuid, sizeof(user_config.uuid));
+
+ if (__copy_to_user(user_config_ptr, &user_config,
+ sizeof(user_config))) {
+ ret = -EFAULT;
+ goto out;
+ }
+
+ ret = total_size;
+
+out:
+ mutex_unlock(&i915->perf.metrics_lock);
+ return ret;
+}
+
+static int query_perf_config_list(struct drm_i915_private *i915,
+ struct drm_i915_query_item *query_item)
+{
+ struct drm_i915_query_perf_config __user *user_query_config_ptr =
+ u64_to_user_ptr(query_item->data_ptr);
+ struct i915_oa_config *oa_config;
+ u32 flags, total_size;
+ u64 n_configs;
+ int ret, id;
+
+ if (!i915->perf.initialized)
+ return -ENODEV;
+
+ /* Count the default test configuration */
+ n_configs = i915->perf.n_metrics + 1;
+ total_size = sizeof(struct drm_i915_query_perf_config) +
+ sizeof(u64) * n_configs;
+
+ if (query_item->length == 0)
+ return total_size;
+
+ if (query_item->length < total_size) {
+ DRM_DEBUG("Invalid query config list item size=%u expected=%u\n",
+ query_item->length, total_size);
+ return -EINVAL;
+ }
+
+ if (!access_ok(user_query_config_ptr, total_size))
+ return -EFAULT;
+
+ if (__get_user(flags, &user_query_config_ptr->flags))
+ return -EFAULT;
+
+ if (flags != 0)
+ return -EINVAL;
+
+ if (__put_user(n_configs, &user_query_config_ptr->config))
+ return -EFAULT;
+
+ if (__put_user((u64)1ULL, &user_query_config_ptr->data[0]))
+ return -EFAULT;
+
+ ret = mutex_lock_interruptible(&i915->perf.metrics_lock);
+ if (ret)
+ return ret;
+
+ n_configs = 1;
+ idr_for_each_entry(&i915->perf.metrics_idr, oa_config, id) {
+ u64 __user *item =
+ u64_to_user_ptr(query_item->data_ptr +
+ sizeof(struct drm_i915_query_perf_config) +
+ n_configs * sizeof(u64));
+
+ if (__put_user((u64)id, item)) {
+ ret = -EFAULT;
+ goto out;
+ }
+ n_configs++;
+ }
+
+ ret = total_size;
+
+out:
+ mutex_unlock(&i915->perf.metrics_lock);
+ return ret;
+}
+
+static int query_perf_config(struct drm_i915_private *i915,
+ struct drm_i915_query_item *query_item)
+{
+ switch (query_item->flags) {
+ case DRM_I915_QUERY_PERF_CONFIG_LIST:
+ return query_perf_config_list(i915, query_item);
+ case DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID:
+ return query_perf_config_data(i915, query_item, true);
+ case DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_ID:
+ return query_perf_config_data(i915, query_item, false);
+ default:
+ return -EINVAL;
+ }
+}
+
static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv,
struct drm_i915_query_item *query_item) = {
query_topology_info,
query_engine_info,
+ query_perf_config,
};
int i915_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index e3c6c72193ed..c57a490db329 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -2108,6 +2108,7 @@ struct drm_i915_query_item {
__u64 query_id;
#define DRM_I915_QUERY_TOPOLOGY_INFO 1
#define DRM_I915_QUERY_ENGINE_INFO 2
+#define DRM_I915_QUERY_PERF_CONFIG 3
/* Must be kept compact -- no holes and well documented */
/*
@@ -2119,9 +2120,18 @@ struct drm_i915_query_item {
__s32 length;
/*
- * Unused for now. Must be cleared to zero.
+ * When query_id == DRM_I915_QUERY_TOPOLOGY_INFO, must be 0.
+ *
+ * When query_id == DRM_I915_QUERY_PERF_CONFIG, must be one of the
+ * following :
+ * - DRM_I915_QUERY_PERF_CONFIG_LIST
+ * - DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID
+ * - DRM_I915_QUERY_PERF_CONFIG_FOR_UUID
*/
__u32 flags;
+#define DRM_I915_QUERY_PERF_CONFIG_LIST 1
+#define DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID 2
+#define DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_ID 3
/*
* Data will be written at the location pointed by data_ptr when the
@@ -2247,6 +2257,56 @@ struct drm_i915_query_engine_info {
struct drm_i915_engine_info engines[];
};
+/*
+ * Data written by the kernel with query DRM_I915_QUERY_PERF_CONFIG.
+ */
+struct drm_i915_query_perf_config {
+ union {
+ /*
+ * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_LIST, i915 sets
+ * this fields to the number of configurations available.
+ */
+ __u64 n_configs;
+
+ /*
+ * When query_id == DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_ID,
+ * i915 will use the value in this field as configuration
+ * identifier to decide what data to write into config_ptr.
+ */
+ __u64 config;
+
+ /*
+ * When query_id == DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID,
+ * i915 will use the value in this field as configuration
+ * identifier to decide what data to write into config_ptr.
+ *
+ * String formatted like "%08x-%04x-%04x-%04x-%012x"
+ */
+ char uuid[36];
+ };
+
+ /*
+ * Unused for now. Must be cleared to zero.
+ */
+ __u32 flags;
+
+ /*
+ * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_LIST, i915 will
+ * write an array of __u64 of configuration identifiers.
+ *
+ * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_DATA, i915 will
+ * write a struct drm_i915_perf_oa_config. If the following fields of
+ * drm_i915_perf_oa_config are set not set to 0, i915 will write into
+ * the associated pointers the values of submitted when the
+ * configuration was created :
+ *
+ * - n_mux_regs
+ * - n_boolean_regs
+ * - n_flex_regs
+ */
+ __u8 data[];
+};
+
#if defined(__cplusplus)
}
#endif
--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Vulkan performance query support (rev4)
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (6 preceding siblings ...)
2019-06-05 13:38 ` [PATCH v4 7/7] drm/i915: add support for perf configuration queries Lionel Landwerlin
@ 2019-06-05 15:19 ` Patchwork
2019-06-05 15:24 ` ✗ Fi.CI.SPARSE: " Patchwork
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-06-05 15:19 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Vulkan performance query support (rev4)
URL : https://patchwork.freedesktop.org/series/60916/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
abfe9e305ec9 drm/i915/perf: introduce a versioning of the i915-perf uapi
32203e3c3c4c drm/i915/perf: allow for CS OA configs to be created lazily
-:124: CHECK:SPACING: No space is necessary after a cast
#124: FILE: drivers/gpu/drm/i915/i915_perf.c:395:
+ (u32) MI_LOAD_REGISTER_IMM_MAX_REGS);
total: 0 errors, 0 warnings, 1 checks, 311 lines checked
3aef0b772b8a drm/i915: introduce a mechanism to extend execbuf2
-:126: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#126: FILE: include/uapi/drm/i915_drm.h:1170:
+#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_EXT<<1))
^
total: 0 errors, 0 warnings, 1 checks, 103 lines checked
bfa3bc4cccc0 drm/i915: add syncobj timeline support
-:341: WARNING:TYPO_SPELLING: 'transfered' may be misspelled - perhaps 'transferred'?
#341: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2488:
+ * The chain's ownership is transfered to the
-:365: ERROR:CODE_INDENT: code indent should use tabs where possible
#365: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2512:
+ [DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES] = parse_timeline_fences,$
-:365: WARNING:LEADING_SPACE: please, no spaces at the start of a line
#365: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2512:
+ [DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES] = parse_timeline_fences,$
total: 1 errors, 2 warnings, 0 checks, 511 lines checked
151ed539e4ba drm/i915: add a new perf configuration execbuf parameter
-:44: CHECK:LINE_SPACING: Please don't use multiple blank lines
#44: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1206:
+
-:170: ERROR:CODE_INDENT: code indent should use tabs where possible
#170: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2620:
+ [DRM_I915_GEM_EXECBUFFER_EXT_PERF] = parse_perf_config,$
-:170: WARNING:LEADING_SPACE: please, no spaces at the start of a line
#170: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2620:
+ [DRM_I915_GEM_EXECBUFFER_EXT_PERF] = parse_perf_config,$
total: 1 errors, 1 warnings, 1 checks, 416 lines checked
ccd1cbb63c8e drm/i915/perf: allow holding preemption on filtered ctx
-:140: WARNING:BRACES: braces {} are not necessary for single statement blocks
#140: FILE: drivers/gpu/drm/i915/i915_perf.c:2727:
+ if (IS_HASWELL(dev_priv) && specific_ctx && !props->hold_preemption) {
privileged_op = false;
+ }
total: 0 errors, 1 warnings, 0 checks, 165 lines checked
ce2af5b1a9ca drm/i915: add support for perf configuration queries
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* ✗ Fi.CI.SPARSE: warning for drm/i915: Vulkan performance query support (rev4)
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (7 preceding siblings ...)
2019-06-05 15:19 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Vulkan performance query support (rev4) Patchwork
@ 2019-06-05 15:24 ` Patchwork
2019-06-05 15:41 ` ✓ Fi.CI.BAT: success " Patchwork
2019-06-07 4:23 ` ✗ Fi.CI.IGT: failure " Patchwork
10 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-06-05 15:24 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Vulkan performance query support (rev4)
URL : https://patchwork.freedesktop.org/series/60916/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915/perf: introduce a versioning of the i915-perf uapi
Okay!
Commit: drm/i915/perf: allow for CS OA configs to be created lazily
+drivers/gpu/drm/i915/i915_perf.c:394:37: warning: expression using sizeof(void)
Commit: drm/i915: introduce a mechanism to extend execbuf2
Okay!
Commit: drm/i915: add syncobj timeline support
+./include/linux/mm.h:652:13: error: not a function <noident>
Commit: drm/i915: add a new perf configuration execbuf parameter
+ ^~
+ ^~
+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2114:40: error: ‘struct i915_perf_stream’ has no member named ‘hold_preemption’
+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2114:47: error: no member 'hold_preemption' in struct i915_perf_stream
+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2115:14: error: ‘struct i915_request’ has no member named ‘has_perf’
+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2115:28: error: no member 'has_perf' in struct i915_request
+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c: In function ‘eb_oa_config’:
-drivers/gpu/drm/i915/gvt/mmio.c:281:23: warning: memcpy with byte count of 279040
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/gvt/vgpu.c:196:48: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_gpu_error.c:1006:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_gpu_error.c:1006:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_gpu_error.c:906:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_gpu_error.c:906:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_perf.c:1528:15: warning: memset with byte count of 16777216
-drivers/gpu/drm/i915/i915_perf.c:1586:15: warning: memset with byte count of 16777216
-drivers/gpu/drm/i915/i915_perf.c:395:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_scheduler.h:70:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:565:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:565:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:566:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:566:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:568:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:568:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:569:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:569:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:582:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:582:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:584:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:655:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_vma.c:655:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/icl_dsi.c:135:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:306:15: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:306:15: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:482:15: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:601:15: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:971:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_audio.c:971:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:129:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:129:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:169:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:169:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:171:20: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:171:20: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:191:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:191:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:195:44: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:195:44: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_bw.c:244:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2246:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2249:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2258:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2266:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2275:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2307:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2307:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2343:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2343:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2536:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2536:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2570:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_cdclk.c:2570:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:120:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:226:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:236:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:239:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:242:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:244:38: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:247:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:250:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_color.c:340:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_ddi.c:669:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_ddi.c:671:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:1201:22: error: Expected constant expression in case statement
-drivers/gpu/drm/i915/intel_display.c:1204:22: error: Expected constant expression in case statement
-drivers/gpu/drm/i915/intel_display.c:1207:22: error: Expected constant expression in case statement
-drivers/gpu/drm/i915/intel_display.c:1210:22: error: Expected constant expression in case statement
-drivers/gpu/drm/i915/intel_display.c:14314:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:14314:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:2419:13: error: undefined identifier '__builtin_add_overflow_p'
-drivers/gpu/drm/i915/intel_display.c:2787:28: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:2787:28: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:7367:26: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:882:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_display.c:882:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1438:39: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1802:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1802:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1935:23: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1955:25: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1955:25: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1977:58: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:1977:58: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:255:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:300:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:300:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:393:28: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:393:28: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:4370:26: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:4370:26: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:4413:27: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:4413:27: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:5940:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6644:31: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6673:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6673:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6673:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6673:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6674:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6674:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6674:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6674:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6675:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6675:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6675:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6675:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6676:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6676:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6676:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6676:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6677:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6677:9: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_dp.c:6677:9: w
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915: Vulkan performance query support (rev4)
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (8 preceding siblings ...)
2019-06-05 15:24 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-06-05 15:41 ` Patchwork
2019-06-07 4:23 ` ✗ Fi.CI.IGT: failure " Patchwork
10 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-06-05 15:41 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Vulkan performance query support (rev4)
URL : https://patchwork.freedesktop.org/series/60916/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6195 -> Patchwork_13180
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/
Known issues
------------
Here are the changes found in Patchwork_13180 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fence@basic-await-default:
- fi-icl-y: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#110246])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-icl-y/igt@gem_exec_fence@basic-await-default.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/fi-icl-y/igt@gem_exec_fence@basic-await-default.html
#### Possible fixes ####
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][3] ([fdo#102614]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
* igt@prime_vgem@basic-fence-flip:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-icl-u3/igt@prime_vgem@basic-fence-flip.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/fi-icl-u3/igt@prime_vgem@basic-fence-flip.html
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
Participating hosts (52 -> 45)
------------------------------
Additional (1): fi-apl-guc
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-icl-guc fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6195 -> Patchwork_13180
CI_DRM_6195: 06b71939f2477c76f9eecb1dd5e99dcb25cb8371 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5039: 2d4f470bba1cb51ed116fb80b170f717c6294714 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13180: ce2af5b1a9ca2cbbdb66304b5ad559290fb8dbd3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ce2af5b1a9ca drm/i915: add support for perf configuration queries
ccd1cbb63c8e drm/i915/perf: allow holding preemption on filtered ctx
151ed539e4ba drm/i915: add a new perf configuration execbuf parameter
bfa3bc4cccc0 drm/i915: add syncobj timeline support
3aef0b772b8a drm/i915: introduce a mechanism to extend execbuf2
32203e3c3c4c drm/i915/perf: allow for CS OA configs to be created lazily
abfe9e305ec9 drm/i915/perf: introduce a versioning of the i915-perf uapi
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* ✗ Fi.CI.IGT: failure for drm/i915: Vulkan performance query support (rev4)
2019-06-05 13:38 [PATCH v4 0/7] drm/i915: Vulkan performance query support Lionel Landwerlin
` (9 preceding siblings ...)
2019-06-05 15:41 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-06-07 4:23 ` Patchwork
10 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-06-07 4:23 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Vulkan performance query support (rev4)
URL : https://patchwork.freedesktop.org/series/60916/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6195_full -> Patchwork_13180_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13180_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_13180_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13180_full:
### IGT changes ###
#### Possible regressions ####
* igt@perf@buffer-fill:
- shard-apl: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl1/igt@perf@buffer-fill.html
* igt@perf@create-destroy-userspace-config:
- shard-glk: [PASS][2] -> [DMESG-WARN][3] +11 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-glk9/igt@perf@create-destroy-userspace-config.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-glk4/igt@perf@create-destroy-userspace-config.html
* igt@perf@disabled-read-error:
- shard-skl: [PASS][4] -> [INCOMPLETE][5] +2 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl10/igt@perf@disabled-read-error.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl1/igt@perf@disabled-read-error.html
* igt@perf@gen8-unprivileged-single-ctx-counters:
- shard-skl: [PASS][6] -> [DMESG-WARN][7] +10 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl10/igt@perf@gen8-unprivileged-single-ctx-counters.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl2/igt@perf@gen8-unprivileged-single-ctx-counters.html
* igt@perf@invalid-create-userspace-config:
- shard-kbl: [PASS][8] -> [DMESG-WARN][9] +11 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-kbl7/igt@perf@invalid-create-userspace-config.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl7/igt@perf@invalid-create-userspace-config.html
* igt@perf@invalid-oa-exponent:
- shard-hsw: [PASS][10] -> [DMESG-WARN][11] +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw2/igt@perf@invalid-oa-exponent.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@perf@invalid-oa-exponent.html
- shard-iclb: [PASS][12] -> [DMESG-WARN][13] +10 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb6/igt@perf@invalid-oa-exponent.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb4/igt@perf@invalid-oa-exponent.html
* igt@perf@low-oa-exponent-permissions:
- shard-apl: [PASS][14] -> [DMESG-WARN][15] +9 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl1/igt@perf@low-oa-exponent-permissions.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl2/igt@perf@low-oa-exponent-permissions.html
* igt@runner@aborted:
- shard-hsw: NOTRUN -> ([FAIL][16], [FAIL][17], [FAIL][18], [FAIL][19], [FAIL][20], [FAIL][21], [FAIL][22], [FAIL][23], [FAIL][24], [FAIL][25], [FAIL][26], [FAIL][27]) ([fdo#108770])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw8/igt@runner@aborted.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw1/igt@runner@aborted.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw8/igt@runner@aborted.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw6/igt@runner@aborted.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@runner@aborted.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw1/igt@runner@aborted.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@runner@aborted.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw1/igt@runner@aborted.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@runner@aborted.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw1/igt@runner@aborted.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@runner@aborted.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw8/igt@runner@aborted.html
- shard-kbl: NOTRUN -> ([FAIL][28], [FAIL][29], [FAIL][30], [FAIL][31])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl4/igt@runner@aborted.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl3/igt@runner@aborted.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl7/igt@runner@aborted.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl4/igt@runner@aborted.html
- shard-iclb: NOTRUN -> ([FAIL][32], [FAIL][33], [FAIL][34]) ([fdo#110718])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb5/igt@runner@aborted.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb7/igt@runner@aborted.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@runner@aborted.html
- shard-apl: NOTRUN -> ([FAIL][35], [FAIL][36], [FAIL][37])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl6/igt@runner@aborted.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl1/igt@runner@aborted.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl1/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@gem_exec_balancer@bonded-cork}:
- shard-iclb: [PASS][38] -> [FAIL][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb6/igt@gem_exec_balancer@bonded-cork.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb1/igt@gem_exec_balancer@bonded-cork.html
Known issues
------------
Here are the changes found in Patchwork_13180_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@reset-stress:
- shard-snb: [PASS][40] -> [FAIL][41] ([fdo#109661])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-snb1/igt@gem_eio@reset-stress.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-snb7/igt@gem_eio@reset-stress.html
* igt@i915_selftest@mock_fence:
- shard-iclb: [PASS][42] -> [INCOMPLETE][43] ([fdo#107713]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@i915_selftest@mock_fence.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb7/igt@i915_selftest@mock_fence.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][44] -> [DMESG-WARN][45] ([fdo#108566]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl4/igt@i915_suspend@fence-restore-tiled2untiled.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl4/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [PASS][46] -> [FAIL][47] ([fdo#102670])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: [PASS][48] -> [INCOMPLETE][49] ([fdo#104108])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl3/igt@kms_fbcon_fbt@psr-suspend.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl1/igt@kms_fbcon_fbt@psr-suspend.html
* igt@kms_flip@2x-plain-flip-ts-check-interruptible:
- shard-hsw: [PASS][50] -> [SKIP][51] ([fdo#109271]) +20 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw8/igt@kms_flip@2x-plain-flip-ts-check-interruptible.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw1/igt@kms_flip@2x-plain-flip-ts-check-interruptible.html
* igt@kms_flip@modeset-vs-vblank-race-interruptible:
- shard-glk: [PASS][52] -> [FAIL][53] ([fdo#103060])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-glk2/igt@kms_flip@modeset-vs-vblank-race-interruptible.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-glk8/igt@kms_flip@modeset-vs-vblank-race-interruptible.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
- shard-iclb: [PASS][54] -> [FAIL][55] ([fdo#103167]) +3 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-gtt:
- shard-iclb: [PASS][56] -> [FAIL][57] ([fdo#109247]) +3 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-gtt.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][58] -> [FAIL][59] ([fdo#108145] / [fdo#110403])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_primary_render:
- shard-iclb: [PASS][60] -> [SKIP][61] ([fdo#109441])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb2/igt@kms_psr@psr2_primary_render.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb7/igt@kms_psr@psr2_primary_render.html
* igt@kms_sysfs_edid_timing:
- shard-iclb: [PASS][62] -> [FAIL][63] ([fdo#100047])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb4/igt@kms_sysfs_edid_timing.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb3/igt@kms_sysfs_edid_timing.html
* igt@perf@buffer-fill:
- shard-hsw: [PASS][64] -> [DMESG-WARN][65] ([fdo#110789]) +7 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw4/igt@perf@buffer-fill.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@perf@buffer-fill.html
* igt@perf@disabled-read-error:
- shard-glk: [PASS][66] -> [INCOMPLETE][67] ([fdo#103359] / [k.org#198133]) +2 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-glk7/igt@perf@disabled-read-error.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-glk6/igt@perf@disabled-read-error.html
- shard-kbl: [PASS][68] -> [INCOMPLETE][69] ([fdo#103665]) +2 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-kbl3/igt@perf@disabled-read-error.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl4/igt@perf@disabled-read-error.html
- shard-hsw: [PASS][70] -> [INCOMPLETE][71] ([fdo#103540])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@perf@disabled-read-error.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw8/igt@perf@disabled-read-error.html
* igt@perf@oa-formats:
- shard-apl: [PASS][72] -> [INCOMPLETE][73] ([fdo#103927]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl3/igt@perf@oa-formats.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl1/igt@perf@oa-formats.html
- shard-hsw: [PASS][74] -> [INCOMPLETE][75] ([fdo#103540] / [fdo#108767])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw4/igt@perf@oa-formats.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@perf@oa-formats.html
#### Possible fixes ####
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [DMESG-WARN][76] ([fdo#108686]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl2/igt@gem_tiled_swapping@non-threaded.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl4/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][78] ([fdo#108566]) -> [PASS][79] +4 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl6/igt@gem_workarounds@suspend-resume-context.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-apl6/igt@gem_workarounds@suspend-resume-context.html
* igt@i915_pm_backlight@fade_with_suspend:
- shard-skl: [INCOMPLETE][80] ([fdo#104108]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl7/igt@i915_pm_backlight@fade_with_suspend.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl10/igt@i915_pm_backlight@fade_with_suspend.html
* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [INCOMPLETE][82] ([fdo#103665]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-kbl6/igt@kms_flip@flip-vs-suspend.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-kbl7/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
- shard-iclb: [FAIL][84] ([fdo#103167]) -> [PASS][85] +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff.html
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-iclb: [FAIL][86] ([fdo#103167] / [fdo#110378]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-rte.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-hsw: [SKIP][88] ([fdo#109271]) -> [PASS][89] +6 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][90] ([fdo#109642]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@kms_psr2_su@frontbuffer.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][92] ([fdo#109441]) -> [PASS][93] +2 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_gtt.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
#### Warnings ####
* igt@gem_mmap_gtt@forked-big-copy-odd:
- shard-iclb: [INCOMPLETE][94] ([fdo#107713] / [fdo#109100]) -> [TIMEOUT][95] ([fdo#109673])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb3/igt@gem_mmap_gtt@forked-big-copy-odd.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-iclb2/igt@gem_mmap_gtt@forked-big-copy-odd.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [SKIP][96] ([fdo#109271]) -> [FAIL][97] ([fdo#105767])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
- shard-skl: [FAIL][98] ([fdo#108040]) -> [FAIL][99] ([fdo#103167]) +1 similar issue
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/shard-skl5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#108770]: https://bugs.freedesktop.org/show_bug.cgi?id=108770
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110718]: https://bugs.freedesktop.org/show_bug.cgi?id=110718
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6195 -> Patchwork_13180
CI_DRM_6195: 06b71939f2477c76f9eecb1dd5e99dcb25cb8371 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5039: 2d4f470bba1cb51ed116fb80b170f717c6294714 @ g
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13180/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread