Commit b1066a12 authored by Lowry Li (Arm Technology China)'s avatar Lowry Li (Arm Technology China) Committed by james qian wang (Arm Technology China)
Browse files

drm: Clear the fence pointer when writeback job signaled 



During it signals the completion of a writeback job, after releasing
the out_fence, we'd clear the pointer.

Check if fence left over in drm_writeback_cleanup_job(), release it.

Signed-off-by: default avatarLowry Li (Arm Technology China) <lowry.li@arm.com>
Reviewed-by: default avatarBrian Starkey <brian.starkey@arm.com>
Reviewed-by: default avatarJames Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: default avatarjames qian wang (Arm Technology China) <james.qian.wang@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1564571048-15029-3-git-send-email-lowry.li@arm.com
parent 8581d510

drivers/gpu/drm/drm_writeback.c

+15 −8
Original line number Diff line number Diff line
@@ -324,6 +324,9 @@ void drm_writeback_cleanup_job(struct drm_writeback_job *job) 
	if (job->fb)

		drm_framebuffer_put(job->fb);



	if (job->out_fence)

		dma_fence_put(job->out_fence);



	kfree(job);

}

EXPORT_SYMBOL(drm_writeback_cleanup_job);
@@ -366,25 +369,29 @@ drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector, 
{

	unsigned long flags;

	struct drm_writeback_job *job;

	struct dma_fence *out_fence;



	spin_lock_irqsave(&wb_connector->job_lock, flags);

	job = list_first_entry_or_null(&wb_connector->job_queue,

				       struct drm_writeback_job,

				       list_entry);

	if (job) {

	if (job)

		list_del(&job->list_entry);

		if (job->out_fence) {

			if (status)

				dma_fence_set_error(job->out_fence, status);

			dma_fence_signal(job->out_fence);

			dma_fence_put(job->out_fence);

		}

	}



	spin_unlock_irqrestore(&wb_connector->job_lock, flags);



	if (WARN_ON(!job))

		return;



	out_fence = job->out_fence;

	if (out_fence) {

		if (status)

			dma_fence_set_error(out_fence, status);

		dma_fence_signal(out_fence);

		dma_fence_put(out_fence);

		job->out_fence = NULL;

	}



	INIT_WORK(&job->cleanup_work, cleanup_work);

	queue_work(system_long_wq, &job->cleanup_work);

}