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

Commit 545036a9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

Core Changes:
- sync_file: Fix race in SYNC_IOC_FILE_INFO (John)
- atomic_helper: Give up reference taken in suspend helper (Jeffy)

Cc: John Einar Reitan <john.reitan@arm.com>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>

* tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc:
  sync_file: Return consistent status in SYNC_IOC_FILE_INFO
  drm/atomic: Unref duplicated drm_atomic_state in drm_atomic_helper_resume()
parents 8a5776a5 f7974880

drivers/dma-buf/sync_file.c

+12 −5
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, 
	return err;

}



static void sync_fill_fence_info(struct dma_fence *fence,

static int sync_fill_fence_info(struct dma_fence *fence,

				 struct sync_fence_info *info)

{

	strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
@@ -399,6 +399,8 @@ static void sync_fill_fence_info(struct dma_fence *fence, 
		test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags) ?

		ktime_to_ns(fence->timestamp) :

		ktime_set(0, 0);



	return info->status;

}



static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
@@ -424,8 +426,12 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 
	 * sync_fence_info and return the actual number of fences on

	 * info->num_fences.

	 */

	if (!info.num_fences)

	if (!info.num_fences) {

		info.status = dma_fence_is_signaled(sync_file->fence);

		goto no_fences;

	} else {

		info.status = 1;

	}



	if (info.num_fences < num_fences)

		return -EINVAL;
@@ -435,8 +441,10 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 
	if (!fence_info)

		return -ENOMEM;



	for (i = 0; i < num_fences; i++)

		sync_fill_fence_info(fences[i], &fence_info[i]);

	for (i = 0; i < num_fences; i++) {

		int status = sync_fill_fence_info(fences[i], &fence_info[i]);

		info.status = info.status <= 0 ? info.status : status;

	}



	if (copy_to_user(u64_to_user_ptr(info.sync_fence_info), fence_info,

			 size)) {
@@ -446,7 +454,6 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 


no_fences:

	sync_file_get_name(sync_file, info.name, sizeof(info.name));

	info.status = dma_fence_is_signaled(sync_file->fence);

	info.num_fences = num_fences;



	if (copy_to_user((void __user *)arg, &info, sizeof(info)))

drivers/gpu/drm/drm_atomic_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -2960,6 +2960,7 @@ int drm_atomic_helper_resume(struct drm_device *dev, 
		drm_modeset_backoff(&ctx);

	}



	drm_atomic_state_put(state);

	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);