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

Commit 7296e25f authored by Kamil Debski's avatar Kamil Debski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Fix interrupt error handling routine 



New context states were added but handling in s5p_mfc_handle_error for
these states was not. After this patch these states are be handled
correctly.

Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a26860bd

drivers/media/platform/s5p-mfc/s5p_mfc.c

+37 −51
Original line number Diff line number Diff line
@@ -412,39 +412,19 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx, 
}



/* Error handling for interrupt */

static void s5p_mfc_handle_error(struct s5p_mfc_ctx *ctx,

				 unsigned int reason, unsigned int err)

static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev,

		struct s5p_mfc_ctx *ctx, unsigned int reason, unsigned int err)

{

	struct s5p_mfc_dev *dev;

	unsigned long flags;



	/* If no context is available then all necessary

	 * processing has been done. */

	if (ctx == NULL)

		return;



	dev = ctx->dev;

	mfc_err("Interrupt Error: %08x\n", err);

	s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev);

	wake_up_dev(dev, reason, err);



	if (ctx != NULL) {

		/* Error recovery is dependent on the state of context */

		switch (ctx->state) {

	case MFCINST_INIT:

		/* This error had to happen while acquireing instance */

	case MFCINST_GOT_INST:

		/* This error had to happen while parsing the header */

	case MFCINST_HEAD_PARSED:

		/* This error had to happen while setting dst buffers */

	case MFCINST_RETURN_INST:

		/* This error had to happen while releasing instance */

		clear_work_bit(ctx);

		wake_up_ctx(ctx, reason, err);

		if (test_and_clear_bit(0, &dev->hw_lock) == 0)

			BUG();

		s5p_mfc_clock_off();

		ctx->state = MFCINST_ERROR;

		break;

		case MFCINST_RES_CHANGE_INIT:

		case MFCINST_RES_CHANGE_FLUSH:

		case MFCINST_RES_CHANGE_END:

		case MFCINST_FINISHING:

		case MFCINST_FINISHED:

		case MFCINST_RUNNING:
@@ -454,20 +434,26 @@ static void s5p_mfc_handle_error(struct s5p_mfc_ctx *ctx, 
			ctx->state = MFCINST_ERROR;

			/* Mark all dst buffers as having an error */

			spin_lock_irqsave(&dev->irqlock, flags);

		s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->dst_queue,

				&ctx->vq_dst);

			s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue,

						&ctx->dst_queue, &ctx->vq_dst);

			/* Mark all src buffers as having an error */

		s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->src_queue,

				&ctx->vq_src);

			s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue,

						&ctx->src_queue, &ctx->vq_src);

			spin_unlock_irqrestore(&dev->irqlock, flags);

		if (test_and_clear_bit(0, &dev->hw_lock) == 0)

			BUG();

		s5p_mfc_clock_off();

			wake_up_ctx(ctx, reason, err);

			break;

		default:

		mfc_err("Encountered an error interrupt which had not been handled\n");

			clear_work_bit(ctx);

			ctx->state = MFCINST_ERROR;

			wake_up_ctx(ctx, reason, err);

			break;

		}

	}

	if (test_and_clear_bit(0, &dev->hw_lock) == 0)

		BUG();

	s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev);

	s5p_mfc_clock_off();

	wake_up_dev(dev, reason, err);

	return;

}
@@ -632,7 +618,7 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv) 
				dev->warn_start)

			s5p_mfc_handle_frame(ctx, reason, err);

		else

			s5p_mfc_handle_error(ctx, reason, err);

			s5p_mfc_handle_error(dev, ctx, reason, err);

		clear_bit(0, &dev->enter_suspend);

		break;