Merge remote-tracking branch 'origin/master' into drm-next

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / amd / amdkfd / kfd_chardev.c

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index fcfdf23e1913ed01663b46bebfda5eec8bc4079d..732087dcac914bf88bf5b6e9e244ac92922ba568 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -141,6 +141,8 @@ static int kfd_ioctl_get_version(struct file *filep, struct kfd_process *p,
 static int set_queue_properties_from_user(struct queue_properties *q_properties,
                                struct kfd_ioctl_create_queue_args *args)
 {
+       void *tmp;
+
        if (args->queue_percentage > KFD_MAX_QUEUE_PERCENTAGE) {
                pr_err("kfd: queue percentage must be between 0 to KFD_MAX_QUEUE_PERCENTAGE\n");
                return -EINVAL;
@@ -178,6 +180,20 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
                return -EFAULT;
        }
 
+       tmp = (void *)(uintptr_t)args->eop_buffer_address;
+       if (tmp != NULL &&
+               !access_ok(VERIFY_WRITE, tmp, sizeof(uint32_t))) {
+               pr_debug("kfd: can't access eop buffer");
+               return -EFAULT;
+       }
+
+       tmp = (void *)(uintptr_t)args->ctx_save_restore_address;
+       if (tmp != NULL &&
+               !access_ok(VERIFY_WRITE, tmp, sizeof(uint32_t))) {
+               pr_debug("kfd: can't access ctx save restore buffer");
+               return -EFAULT;
+       }
+
        q_properties->is_interop = false;
        q_properties->queue_percent = args->queue_percentage;
        q_properties->priority = args->queue_priority;
@@ -185,9 +201,16 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
        q_properties->queue_size = args->ring_size;
        q_properties->read_ptr = (uint32_t *) args->read_pointer_address;
        q_properties->write_ptr = (uint32_t *) args->write_pointer_address;
+       q_properties->eop_ring_buffer_address = args->eop_buffer_address;
+       q_properties->eop_ring_buffer_size = args->eop_buffer_size;
+       q_properties->ctx_save_restore_area_address =
+                       args->ctx_save_restore_address;
+       q_properties->ctx_save_restore_area_size = args->ctx_save_restore_size;
        if (args->queue_type == KFD_IOC_QUEUE_TYPE_COMPUTE ||
                args->queue_type == KFD_IOC_QUEUE_TYPE_COMPUTE_AQL)
                q_properties->type = KFD_QUEUE_TYPE_COMPUTE;
+       else if (args->queue_type == KFD_IOC_QUEUE_TYPE_SDMA)
+               q_properties->type = KFD_QUEUE_TYPE_SDMA;
        else
                return -ENOTSUPP;
 
@@ -214,6 +237,11 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
 
        pr_debug("Queue Format (%d)\n", q_properties->format);
 
+       pr_debug("Queue EOP (0x%llX)\n", q_properties->eop_ring_buffer_address);
+
+       pr_debug("Queue CTX save arex (0x%llX)\n",
+                       q_properties->ctx_save_restore_area_address);
+
        return 0;
 }
 
@@ -235,9 +263,12 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
        if (err)
                return err;
 
+       pr_debug("kfd: looking for gpu id 0x%x\n", args->gpu_id);
        dev = kfd_device_by_id(args->gpu_id);
-       if (dev == NULL)
+       if (dev == NULL) {
+               pr_debug("kfd: gpu id 0x%x was not found\n", args->gpu_id);
                return -EINVAL;
+       }
 
        mutex_lock(&p->mutex);
 
@@ -251,8 +282,8 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
                        p->pasid,
                        dev->id);
 
-       err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, 0,
-                               KFD_QUEUE_TYPE_COMPUTE, &queue_id);
+       err = pqm_create_queue(&p->pqm, dev, filep, &q_properties,
+                               0, q_properties.type, &queue_id);
        if (err != 0)
                goto err_create_queue;
 
@@ -385,7 +416,7 @@ static int kfd_ioctl_set_memory_policy(struct file *filep,
                (args->alternate_policy == KFD_IOC_CACHE_POLICY_COHERENT)
                   ? cache_policy_coherent : cache_policy_noncoherent;
 
-       if (!dev->dqm->set_cache_memory_policy(dev->dqm,
+       if (!dev->dqm->ops.set_cache_memory_policy(dev->dqm,
                                &pdd->qpd,
                                default_policy,
                                alternate_policy,