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

Commit ad1a56f1 authored by Mahesh Kumar's avatar Mahesh Kumar Committed by Rodrigo Vivi
Browse files

Revert "drm: crc: Wait for a frame before returning from open()" 



This reverts commit e8fa5671.

Don't wait for first CRC during crtc_crc_open. It avoids one frame wait
during open. If application want to wait after read call, it can use
poll/read blocking read() call.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180821083858.26275-4-mahesh1.kumar@intel.com
parent c0811a7d

drivers/gpu/drm/drm_debugfs_crc.c

+0 −16
Original line number Diff line number Diff line
@@ -228,24 +228,8 @@ static int crtc_crc_open(struct inode *inode, struct file *filep) 
	if (ret)

		goto err;



	spin_lock_irq(&crc->lock);

	/*

	 * Only return once we got a first frame, so userspace doesn't have to

	 * guess when this particular piece of HW will be ready to start

	 * generating CRCs.

	 */

	ret = wait_event_interruptible_lock_irq(crc->wq,

						crtc_crc_data_count(crc),

						crc->lock);

	spin_unlock_irq(&crc->lock);



	if (ret)

		goto err_disable;



	return 0;



err_disable:

	crtc->funcs->set_crc_source(crtc, NULL);

err:

	spin_lock_irq(&crc->lock);

	crtc_crc_cleanup(crc);