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

Commit 5d83790b authored by Shaik Ameer Basha's avatar Shaik Ameer Basha Committed by Mauro Carvalho Chehab
Browse files

[media] exynos-gsc: send valid m2m ctx to gsc_m2m_job_finish 



gsc_m2m_job_finish() has to be called with the m2m context for the necessary
cleanup while resume. But currently gsc_m2m_job_finish() always passes m2m
context as NULL.
This patch preserves the context before making it null, for necessary cleanup.
Use gsc_m2m_opened() instead gsc_m2m_active() in gsc_resume().

Signed-off-by: default avatarShaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6a536096

drivers/media/platform/exynos-gsc/gsc-core.c

+5 −3
Original line number Diff line number Diff line
@@ -1054,16 +1054,18 @@ static int gsc_m2m_suspend(struct gsc_dev *gsc) 


static int gsc_m2m_resume(struct gsc_dev *gsc)

{

	struct gsc_ctx *ctx;

	unsigned long flags;



	spin_lock_irqsave(&gsc->slock, flags);

	/* Clear for full H/W setup in first run after resume */

	ctx = gsc->m2m.ctx;

	gsc->m2m.ctx = NULL;

	spin_unlock_irqrestore(&gsc->slock, flags);



	if (test_and_clear_bit(ST_M2M_SUSPENDED, &gsc->state))

		gsc_m2m_job_finish(gsc->m2m.ctx,

				    VB2_BUF_STATE_ERROR);

		gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);



	return 0;

}
@@ -1204,7 +1206,7 @@ static int gsc_resume(struct device *dev) 
	/* Do not resume if the device was idle before system suspend */

	spin_lock_irqsave(&gsc->slock, flags);

	if (!test_and_clear_bit(ST_SUSPEND, &gsc->state) ||

	    !gsc_m2m_active(gsc)) {

	    !gsc_m2m_opened(gsc)) {

		spin_unlock_irqrestore(&gsc->slock, flags);

		return 0;

	}