Merge tag 'drm-amdkfd-next-fixes-2015-01-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Here is a pull request of fixes for 3.20 patches, including the fix you asked
me when you merged the previous pull request.

* tag 'drm-amdkfd-next-fixes-2015-01-25' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: change amdkfd version to 0.7.1
  drm/radeon: cik_sdma_ctx_switch_enable() can be static
  drm/amdkfd: Fix sparse errors
  drm/amdkfd: Handle case of invalid queue type
  drm/amdkfd: Add break at the end of case
  drm/amdkfd: Remove negative check of uint variable

6 files changed, 42 insertions, 41 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 732087dcac91..5c50aa8a8908 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -141,8 +141,6 @@ 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;
@@ -180,16 +178,18 @@ 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))) {
+        if (args->eop_buffer_address &&
+                !access_ok(VERIFY_WRITE,
+                        (const void __user *) args->eop_buffer_address,
+                        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))) {
+        if (args->ctx_save_restore_address &&
+                !access_ok(VERIFY_WRITE,
+                        (const void __user *) args->ctx_save_restore_address,
+                        sizeof(uint32_t))) {
                 pr_debug("kfd: can't access ctx save restore buffer");
                 return -EFAULT;
         }
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index a5c69e96ba6f..b189f9791c90 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -62,12 +62,6 @@ enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type)
         return KFD_MQD_TYPE_CP;
 }
 
-inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
-{
-        BUG_ON(!dqm || !dqm->dev);
-        return dqm->dev->shared_resources.compute_pipe_count;
-}
-
 static inline unsigned int get_first_pipe(struct device_queue_manager *dqm)
 {
         BUG_ON(!dqm);
@@ -79,25 +73,6 @@ static inline unsigned int get_pipes_num_cpsch(void)
         return PIPE_PER_ME_CP_SCHEDULING;
 }
 
-inline unsigned int
-get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
-{
-        uint32_t nybble;
-
-        nybble = (pdd->lds_base >> 60) & 0x0E;
-
-        return nybble;
-}
-
-inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
-{
-        unsigned int shared_base;
-
-        shared_base = (pdd->lds_base >> 16) & 0xFF;
-
-        return shared_base;
-}
-
 void program_sh_mem_settings(struct device_queue_manager *dqm,
                                         struct qcm_process_device *qpd)
 {
@@ -301,6 +276,11 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
                 }
                 dqm->sdma_queue_count--;
                 deallocate_sdma_queue(dqm, q->sdma_id);
+        } else {
+                pr_debug("q->properties.type is invalid (%d)\n",
+                                q->properties.type);
+                retval = -EINVAL;
+                goto out;
         }
 
         retval = mqd->destroy_mqd(mqd, q->mqd,
@@ -331,7 +311,8 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
         BUG_ON(!dqm || !q || !q->mqd);
 
         mutex_lock(&dqm->lock);
-        mqd = dqm->ops.get_mqd_manager(dqm, q->properties.type);
+        mqd = dqm->ops.get_mqd_manager(dqm,
+                        get_mqd_type_from_queue_type(q->properties.type));
         if (mqd == NULL) {
                 mutex_unlock(&dqm->lock);
                 return -ENOMEM;
@@ -587,7 +568,7 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm,
 static void deallocate_sdma_queue(struct device_queue_manager *dqm,
                                 unsigned int sdma_queue_id)
 {
-        if (sdma_queue_id < 0 || sdma_queue_id >= CIK_SDMA_QUEUES)
+        if (sdma_queue_id >= CIK_SDMA_QUEUES)
                 return;
         set_bit(sdma_queue_id, (unsigned long *)&dqm->sdma_bitmap);
 }
@@ -1114,8 +1095,11 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
         switch (dev->device_info->asic_family) {
         case CHIP_CARRIZO:
                 device_queue_manager_init_vi(&dqm->ops_asic_specific);
+                break;
+
         case CHIP_KAVERI:
                 device_queue_manager_init_cik(&dqm->ops_asic_specific);
+                break;
         }
 
         if (dqm->ops.initialize(dqm) != 0) {
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index 19347956eeb9..e7b17b28330e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -160,10 +160,24 @@ void device_queue_manager_init_cik(struct device_queue_manager_ops *ops);
 void device_queue_manager_init_vi(struct device_queue_manager_ops *ops);
 void program_sh_mem_settings(struct device_queue_manager *dqm,
                                         struct qcm_process_device *qpd);
-inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *qpd);
-inline unsigned int get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd);
 int init_pipelines(struct device_queue_manager *dqm,
                 unsigned int pipes_num, unsigned int first_pipe);
-inline unsigned int get_pipes_num(struct device_queue_manager *dqm);
+
+extern inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
+{
+        return (pdd->lds_base >> 16) & 0xFF;
+}
+
+extern inline unsigned int
+get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
+{
+        return (pdd->lds_base >> 60) & 0x0E;
+}
+
+extern inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
+{
+        BUG_ON(!dqm || !dqm->dev);
+        return dqm->dev->shared_resources.compute_pipe_count;
+}
 
 #endif /* KFD_DEVICE_QUEUE_MANAGER_H_ */
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index c04b1ac60bd9..e415a2a9207e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -288,8 +288,11 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
         switch (dev->device_info->asic_family) {
         case CHIP_CARRIZO:
                 kernel_queue_init_vi(&kq->ops_asic_specific);
+                break;
+
         case CHIP_KAVERI:
                 kernel_queue_init_cik(&kq->ops_asic_specific);
+                break;
         }
 
         if (kq->ops.initialize(kq, dev, type, KFD_KERNEL_QUEUE_SIZE) == false) {
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index 14c4115c4ae1..ac5445415667 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -29,10 +29,10 @@
 #define KFD_DRIVER_AUTHOR       "AMD Inc. and others"
 
 #define KFD_DRIVER_DESC         "Standalone HSA driver for AMD's GPUs"
-#define KFD_DRIVER_DATE         "20141113"
+#define KFD_DRIVER_DATE         "20150122"
 #define KFD_DRIVER_MAJOR        0
 #define KFD_DRIVER_MINOR        7
-#define KFD_DRIVER_PATCHLEVEL   0
+#define KFD_DRIVER_PATCHLEVEL   1
 
 const struct kfd2kgd_calls *kfd2kgd;
 static const struct kgd2kfd_calls kgd2kfd = {
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 479519c24a1f..7d2ff31c35a5 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -290,7 +290,7 @@ static void cik_sdma_rlc_stop(struct radeon_device *rdev)
  *
  * Halt or unhalt the async dma engines (CIK).
  */
-void cik_sdma_ctx_switch_enable(struct radeon_device *rdev, bool enable)
+static void cik_sdma_ctx_switch_enable(struct radeon_device *rdev, bool enable)
 {
         uint32_t reg_offset, value;
         int i;