Commit b72a6342 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

hantro: Remove unused bytesused argument 



The driver doesn't need the bytesused argument.

For decoders, the plane bytesused is known and therefore,
buf_prepare is used to set it. For encoders, it's
handled by the codec_ops.done hook.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e765dba1

drivers/staging/media/hantro/hantro_drv.c

+4 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts) 


static void hantro_job_finish(struct hantro_dev *vpu,

			      struct hantro_ctx *ctx,

			      unsigned int bytesused,

			      enum vb2_buffer_state result)

{

	struct vb2_v4l2_buffer *src, *dst;
@@ -82,7 +81,7 @@ static void hantro_job_finish(struct hantro_dev *vpu, 
					 result);

}



void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,

void hantro_irq_done(struct hantro_dev *vpu,

		     enum vb2_buffer_state result)

{

	struct hantro_ctx *ctx =
@@ -96,7 +95,7 @@ void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused, 
	if (cancel_delayed_work(&vpu->watchdog_work)) {

		if (result == VB2_BUF_STATE_DONE && ctx->codec_ops->done)

			ctx->codec_ops->done(ctx);

		hantro_job_finish(vpu, ctx, bytesused, result);

		hantro_job_finish(vpu, ctx, result);

	}

}
@@ -111,7 +110,7 @@ void hantro_watchdog(struct work_struct *work) 
	if (ctx) {

		vpu_err("frame processing timed out!\n");

		ctx->codec_ops->reset(ctx);

		hantro_job_finish(vpu, ctx, 0, VB2_BUF_STATE_ERROR);

		hantro_job_finish(vpu, ctx, VB2_BUF_STATE_ERROR);

	}

}
@@ -164,7 +163,7 @@ static void device_run(void *priv) 
	return;



err_cancel_job:

	hantro_job_finish(ctx->dev, ctx, 0, VB2_BUF_STATE_ERROR);

	hantro_job_finish(ctx->dev, ctx, VB2_BUF_STATE_ERROR);

}



static struct v4l2_m2m_ops vpu_m2m_ops = {

drivers/staging/media/hantro/hantro_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ extern const u32 hantro_vp8_dec_mc_filter[8][6]; 


void hantro_watchdog(struct work_struct *work);

void hantro_run(struct hantro_ctx *ctx);

void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,

void hantro_irq_done(struct hantro_dev *vpu,

		     enum vb2_buffer_state result);

void hantro_start_prepare_run(struct hantro_ctx *ctx);

void hantro_end_prepare_run(struct hantro_ctx *ctx);

drivers/staging/media/hantro/imx8m_vpu_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static irqreturn_t imx8m_vpu_g1_irq(int irq, void *dev_id) 
	vdpu_write(vpu, 0, G1_REG_INTERRUPT);

	vdpu_write(vpu, G1_REG_CONFIG_DEC_CLK_GATE_E, G1_REG_CONFIG);



	hantro_irq_done(vpu, 0, state);

	hantro_irq_done(vpu, state);



	return IRQ_HANDLED;

}

drivers/staging/media/hantro/rk3288_vpu_hw.c

+3 −4
Original line number Diff line number Diff line
@@ -113,17 +113,16 @@ static irqreturn_t rk3288_vepu_irq(int irq, void *dev_id) 
{

	struct hantro_dev *vpu = dev_id;

	enum vb2_buffer_state state;

	u32 status, bytesused;

	u32 status;



	status = vepu_read(vpu, H1_REG_INTERRUPT);

	bytesused = vepu_read(vpu, H1_REG_STR_BUF_LIMIT) / 8;

	state = (status & H1_REG_INTERRUPT_FRAME_RDY) ?

		VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;



	vepu_write(vpu, 0, H1_REG_INTERRUPT);

	vepu_write(vpu, 0, H1_REG_AXI_CTRL);



	hantro_irq_done(vpu, bytesused, state);

	hantro_irq_done(vpu, state);



	return IRQ_HANDLED;

}
@@ -141,7 +140,7 @@ static irqreturn_t rk3288_vdpu_irq(int irq, void *dev_id) 
	vdpu_write(vpu, 0, G1_REG_INTERRUPT);

	vdpu_write(vpu, G1_REG_CONFIG_DEC_CLK_GATE_E, G1_REG_CONFIG);



	hantro_irq_done(vpu, 0, state);

	hantro_irq_done(vpu, state);



	return IRQ_HANDLED;

}

drivers/staging/media/hantro/rk3399_vpu_hw.c

+3 −4
Original line number Diff line number Diff line
@@ -92,17 +92,16 @@ static irqreturn_t rk3399_vepu_irq(int irq, void *dev_id) 
{

	struct hantro_dev *vpu = dev_id;

	enum vb2_buffer_state state;

	u32 status, bytesused;

	u32 status;



	status = vepu_read(vpu, VEPU_REG_INTERRUPT);

	bytesused = vepu_read(vpu, VEPU_REG_STR_BUF_LIMIT) / 8;

	state = (status & VEPU_REG_INTERRUPT_FRAME_READY) ?

		VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;



	vepu_write(vpu, 0, VEPU_REG_INTERRUPT);

	vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);



	hantro_irq_done(vpu, bytesused, state);

	hantro_irq_done(vpu, state);



	return IRQ_HANDLED;

}
@@ -120,7 +119,7 @@ static irqreturn_t rk3399_vdpu_irq(int irq, void *dev_id) 
	vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);

	vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL);



	hantro_irq_done(vpu, 0, state);

	hantro_irq_done(vpu, state);



	return IRQ_HANDLED;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE