Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 618a6109 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

two amdkfd patches.

* tag 'drm-amdkfd-next-2017-01-16' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: fix improper return value on error
  amdkfd: fix spelling mistake in kfd_ioctl_dbg_unrgesiter
parents 01f5e691 8bf79388

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+3 −3
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int kfd_ioctl_dbg_register(struct file *filep, 
	return status;

}



static int kfd_ioctl_dbg_unrgesiter(struct file *filep,

static int kfd_ioctl_dbg_unregister(struct file *filep,

				struct kfd_process *p, void *data)

{

	struct kfd_ioctl_dbg_unregister_args *args = data;
@@ -498,7 +498,7 @@ static int kfd_ioctl_dbg_unrgesiter(struct file *filep, 
		return -EINVAL;



	if (dev->device_info->asic_family == CHIP_CARRIZO) {

		pr_debug("kfd_ioctl_dbg_unrgesiter not supported on CZ\n");

		pr_debug("kfd_ioctl_dbg_unregister not supported on CZ\n");

		return -EINVAL;

	}
@@ -892,7 +892,7 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = { 
			kfd_ioctl_dbg_register, 0),



	AMDKFD_IOCTL_DEF(AMDKFD_IOC_DBG_UNREGISTER,

			kfd_ioctl_dbg_unrgesiter, 0),

			kfd_ioctl_dbg_unregister, 0),



	AMDKFD_IOCTL_DEF(AMDKFD_IOC_DBG_ADDRESS_WATCH,

			kfd_ioctl_dbg_address_watch, 0),

drivers/gpu/drm/amd/amdkfd/kfd_events.c

+3 −1
Original line number Diff line number Diff line
@@ -739,8 +739,10 @@ int kfd_wait_on_events(struct kfd_process *p, 
		struct kfd_event_data event_data;



		if (copy_from_user(&event_data, &events[i],

				sizeof(struct kfd_event_data)))

				sizeof(struct kfd_event_data))) {

			ret = -EFAULT;

			goto fail;

		}



		ret = init_event_waiter(p, &event_waiters[i],

				event_data.event_id, i);