Merge branch 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux into drm-next

As discussed on irc, I'm sending a pull request with one important change:

- Disable support for 32-bit user processes. This is done due to AMD's decision
  to remove support for 32-bit user processes on Linux for its HSA stack.

* 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: Disable support for 32-bit user processes

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 102cd36799b1..4f7b275f2f7b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -102,15 +102,26 @@ struct device *kfd_chardev(void)
 static int kfd_open(struct inode *inode, struct file *filep)
 {
         struct kfd_process *process;
+        bool is_32bit_user_mode;
 
         if (iminor(inode) != 0)
                 return -ENODEV;
 
+        is_32bit_user_mode = is_compat_task();
+
+        if (is_32bit_user_mode == true) {
+                dev_warn(kfd_device,
+                        "Process %d (32-bit) failed to open /dev/kfd\n"
+                        "32-bit processes are not supported by amdkfd\n",
+                        current->pid);
+                return -EPERM;
+        }
+
         process = kfd_create_process(current);
         if (IS_ERR(process))
                 return PTR_ERR(process);
 
-        process->is_32bit_user_mode = is_compat_task();
+        process->is_32bit_user_mode = is_32bit_user_mode;
 
         dev_dbg(kfd_device, "process %d opened, compat mode (32 bit) - %d\n",
                 process->pasid, process->is_32bit_user_mode);