drm/msm: Add submit queue queries

Add the capability to query information from a submit queue.
The first available parameter is to query the number of GPU
faults that have been caused by the queue. The driver can
periodically query this value to see if it has caused a fault
and take action accordingly.

Change-Id: Ic0dedbadc68d5782c0b8b71d89722742aa6aaf1a
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index a12da5b..cc3e567 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1711,6 +1711,16 @@ static int msm_ioctl_submitqueue_new(struct drm_device *dev, void *data,
                args->flags, &args->id);
 }
 
+static int msm_ioctl_submitqueue_query(struct drm_device *dev, void *data,
+               struct drm_file *file)
+{
+       struct drm_msm_submitqueue_query *args = data;
+       void __user *ptr = (void __user *)(uintptr_t) args->data;
+
+       return msm_submitqueue_query(file->driver_priv, args->id,
+               args->param, ptr, args->len);
+}
+
 static int msm_ioctl_submitqueue_close(struct drm_device *dev, void *data,
                struct drm_file *file)
 {
@@ -1768,6 +1778,8 @@ static const struct drm_ioctl_desc msm_ioctls[] = {
                          DRM_AUTH|DRM_RENDER_ALLOW),
        DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_CLOSE, msm_ioctl_submitqueue_close,
                          DRM_AUTH|DRM_RENDER_ALLOW),
+       DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query,
+                         DRM_AUTH|DRM_RENDER_ALLOW),
 };
 
 static const struct vm_operations_struct vm_ops = {

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 660c608..adc1e02 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -516,8 +516,11 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx,
                u32 id);
 int msm_submitqueue_create(struct msm_file_private *ctx, u32 prio,
                u32 flags, u32 *id);
+int msm_submitqueue_query(struct msm_file_private *ctx, u32 id, u32 param,
+               void __user *data, u32 len);
 int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id);
 void msm_submitqueue_close(struct msm_file_private *ctx);
+
 void msm_submitqueue_destroy(struct kref *kref);
 
 struct hdmi;

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 45d7a65..cb90d23 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -274,6 +274,20 @@ static void inactive_start(struct msm_gpu *gpu)
                        round_jiffies_up(jiffies + DRM_MSM_INACTIVE_JIFFIES));
 }
 
+static void retire_guilty_submit(struct msm_gpu *gpu,
+               struct msm_ringbuffer *ring)
+{
+       struct msm_gem_submit *submit = list_first_entry_or_null(&ring->submits,
+               struct msm_gem_submit, node);
+
+       if (!submit)
+               return;
+
+       submit->queue->faults++;
+
+       msm_gem_submit_free(submit);
+}
+
 /*
  * Hangcheck detection for locked gpu:
  */
@@ -296,13 +310,12 @@ static void recover_worker(struct work_struct *work)
 
                inactive_cancel(gpu);
 
-               FOR_EACH_RING(gpu, ring, i) {
-                       uint32_t fence = gpu->funcs->last_fence(gpu, ring);
-
+               /* Retire all events that have already passed */
+               FOR_EACH_RING(gpu, ring, i)
                        retire_submits(gpu, ring,
-                               gpu->funcs->active_ring(gpu) == ring ?
-                                       fence + 1 : fence);
-               }
+                               gpu->funcs->last_fence(gpu, ring));
+
+               retire_guilty_submit(gpu, gpu->funcs->active_ring(gpu));
 
                /* Recover the GPU */
                gpu->funcs->recover(gpu);

diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c
index 8e29021..4f2af87 100644 (file)
--- a/drivers/gpu/drm/msm/msm_submitqueue.c
+++ b/drivers/gpu/drm/msm/msm_submitqueue.c
@@ -27,6 +27,9 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx,
 {
        struct msm_gpu_submitqueue *entry;
 
+       if (!ctx)
+               return NULL;
+
        read_lock(&ctx->queuelock);
 
        list_for_each_entry(entry, &ctx->submitqueues, node) {
@@ -95,6 +98,29 @@ int msm_submitqueue_init(struct msm_file_private *ctx)
        return msm_submitqueue_create(ctx, 3, 0, NULL);
 }
 
+int msm_submitqueue_query(struct msm_file_private *ctx, u32 id, u32 param,
+               void __user *data, u32 len)
+{
+       struct msm_gpu_submitqueue *queue = msm_submitqueue_get(ctx, id);
+       int ret = 0;
+
+       if (!queue)
+               return -ENOENT;
+
+       if (param == MSM_SUBMITQUEUE_PARAM_FAULTS) {
+               u32 size = min_t(u32, len, sizeof(queue->faults));
+
+               if (copy_to_user(data, &queue->faults, size))
+                       ret = -EFAULT;
+       } else {
+               ret = -EINVAL;
+       }
+
+       msm_submitqueue_put(queue);
+
+       return ret;
+}
+
 int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id)
 {
        struct msm_gpu_submitqueue *entry;

diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index 831a0c8..ce05a39 100644 (file)
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -370,6 +370,15 @@ struct drm_msm_submitqueue {
        __u32 id;      /* out, identifier */
 };
 
+#define MSM_SUBMITQUEUE_PARAM_FAULTS 0
+
+struct drm_msm_submitqueue_query {
+       __u64 data;
+       __u32 id;
+       __u32 param;
+       __u32 len;
+};
+
 #define DRM_MSM_GET_PARAM              0x00
 /* placeholder:
 #define DRM_MSM_SET_PARAM              0x01
@@ -384,6 +393,7 @@ struct drm_msm_submitqueue {
 #define DRM_MSM_GEM_SVM_NEW            0x09
 #define DRM_MSM_SUBMITQUEUE_NEW        0x0A
 #define DRM_MSM_SUBMITQUEUE_CLOSE      0x0B
+#define DRM_MSM_SUBMITQUEUE_QUERY      0x0C
 
 #define DRM_SDE_WB_CONFIG              0x40
 #define DRM_MSM_REGISTER_EVENT         0x41
@@ -432,6 +442,9 @@ struct drm_msm_submitqueue {
 #define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE \
        DRM_IOW(DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_CLOSE, \
                struct drm_msm_submitqueue)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_QUERY \
+       DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_QUERY, \
+               struct drm_msm_submitqueue_query)
 
 #if defined(__cplusplus)
 }