Commit 2092b383 authored by Jackson.lee's avatar Jackson.lee Committed by Hans Verkuil
Browse files

media: chips-media: wave5: Support runtime suspend/resume 



Add support for runtime suspend/resume in the encoder and decoder. This is
achieved by saving the VPU state and powering it off while the VPU is idle.

Signed-off-by: default avatarJackson.lee <jackson.lee@chipsnmedia.com>
Signed-off-by: default avatarNas Chung <nas.chung@chipsnmedia.com>
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarSebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent b990b008

drivers/media/platform/chips-media/wave5/wave5-helper.c

+0 −13
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ int wave5_vpu_release_device(struct file *filp, 
			     char *name)

{

	struct vpu_instance *inst = wave5_to_vpu_inst(filp->private_data);

	struct vpu_device *dev = inst->dev;

	int ret = 0;



	v4l2_m2m_ctx_release(inst->v4l2_fh.m2m_ctx);
@@ -78,18 +77,6 @@ int wave5_vpu_release_device(struct file *filp, 
	}



	wave5_cleanup_instance(inst);

	if (dev->irq < 0) {

		ret = mutex_lock_interruptible(&dev->dev_lock);

		if (ret)

			return ret;



		if (list_empty(&dev->instances)) {

			dev_dbg(dev->dev, "Disabling the hrtimer\n");

			hrtimer_cancel(&dev->hrtimer);

		}



		mutex_unlock(&dev->dev_lock);

	}



	return ret;

}

drivers/media/platform/chips-media/wave5/wave5-hw.c

+2 −2
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ int wave5_vpu_re_init(struct device *dev, u8 *fw, size_t size) 
	return setup_wave5_properties(dev);

}



static int wave5_vpu_sleep_wake(struct device *dev, bool i_sleep_wake, const uint16_t *code,

int wave5_vpu_sleep_wake(struct device *dev, bool i_sleep_wake, const uint16_t *code,

			 size_t size)

{

	u32 reg_val;

drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c

+16 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2021-2023 CHIPS&MEDIA INC

 */



#include <linux/pm_runtime.h>

#include "wave5-helper.h"



#define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder"
@@ -518,6 +519,8 @@ static void wave5_vpu_dec_finish_decode(struct vpu_instance *inst) 
	if (q_status.report_queue_count == 0 &&

	    (q_status.instance_queue_count == 0 || dec_info.sequence_changed)) {

		dev_dbg(inst->dev->dev, "%s: finishing job.\n", __func__);

		pm_runtime_mark_last_busy(inst->dev->dev);

		pm_runtime_put_autosuspend(inst->dev->dev);

		v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx);

	}

}
@@ -1398,6 +1401,7 @@ static int wave5_vpu_dec_start_streaming(struct vb2_queue *q, unsigned int count 
	int ret = 0;



	dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type);

	pm_runtime_resume_and_get(inst->dev->dev);



	v4l2_m2m_update_start_streaming_state(m2m_ctx, q);
@@ -1429,13 +1433,15 @@ static int wave5_vpu_dec_start_streaming(struct vb2_queue *q, unsigned int count 
		if (ret)

			goto return_buffers;

	}



	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

	return ret;



free_bitstream_vbuf:

	wave5_vdi_free_dma_memory(inst->dev, &inst->bitstream_vbuf);

return_buffers:

	wave5_return_bufs(q, VB2_BUF_STATE_QUEUED);

	pm_runtime_put_autosuspend(inst->dev->dev);

	return ret;

}
@@ -1521,6 +1527,7 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q) 
	bool check_cmd = TRUE;



	dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type);

	pm_runtime_resume_and_get(inst->dev->dev);



	while (check_cmd) {

		struct queue_status_info q_status;
@@ -1544,6 +1551,9 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q) 
		streamoff_output(q);

	else

		streamoff_capture(q);



	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

}



static const struct vb2_ops wave5_vpu_dec_vb2_ops = {
@@ -1630,7 +1640,7 @@ static void wave5_vpu_dec_device_run(void *priv) 
	int ret = 0;



	dev_dbg(inst->dev->dev, "%s: Fill the ring buffer with new bitstream data", __func__);



	pm_runtime_resume_and_get(inst->dev->dev);

	ret = fill_ringbuffer(inst);

	if (ret) {

		dev_warn(inst->dev->dev, "Filling ring buffer failed\n");
@@ -1713,6 +1723,8 @@ static void wave5_vpu_dec_device_run(void *priv) 


finish_job_and_return:

	dev_dbg(inst->dev->dev, "%s: leave and finish job", __func__);

	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

	v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx);

}
@@ -1879,9 +1891,8 @@ static int wave5_vpu_open_dec(struct file *filp) 
	if (ret)

		goto cleanup_inst;



	if (dev->irq < 0 && !hrtimer_active(&dev->hrtimer) && list_empty(&dev->instances))

		hrtimer_start(&dev->hrtimer, ns_to_ktime(dev->vpu_poll_interval * NSEC_PER_MSEC),

			      HRTIMER_MODE_REL_PINNED);

	if (list_empty(&dev->instances))

		pm_runtime_use_autosuspend(inst->dev->dev);



	list_add_tail(&inst->list, &dev->instances);

drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c

+17 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2021-2023 CHIPS&MEDIA INC

 */



#include <linux/pm_runtime.h>

#include "wave5-helper.h"



#define VPU_ENC_DEV_NAME "C&M Wave5 VPU encoder"
@@ -1310,6 +1311,7 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int count 
	struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx;

	int ret = 0;



	pm_runtime_resume_and_get(inst->dev->dev);

	v4l2_m2m_update_start_streaming_state(m2m_ctx, q);



	if (inst->state == VPU_INST_STATE_NONE && q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
@@ -1364,9 +1366,13 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int count 
	if (ret)

		goto return_buffers;



	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

	return 0;

return_buffers:

	wave5_return_bufs(q, VB2_BUF_STATE_QUEUED);

	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

	return ret;

}
@@ -1408,6 +1414,7 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q) 
	 */



	dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type);

	pm_runtime_resume_and_get(inst->dev->dev);



	if (wave5_vpu_both_queues_are_streaming(inst))

		switch_state(inst, VPU_INST_STATE_STOP);
@@ -1432,6 +1439,9 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q) 
		streamoff_output(inst, q);

	else

		streamoff_capture(inst, q);



	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

}



static const struct vb2_ops wave5_vpu_enc_vb2_ops = {
@@ -1478,6 +1488,7 @@ static void wave5_vpu_enc_device_run(void *priv) 
	u32 fail_res = 0;

	int ret = 0;



	pm_runtime_resume_and_get(inst->dev->dev);

	switch (inst->state) {

	case VPU_INST_STATE_PIC_RUN:

		ret = start_encode(inst, &fail_res);
@@ -1491,6 +1502,8 @@ static void wave5_vpu_enc_device_run(void *priv) 
			break;

		}

		dev_dbg(inst->dev->dev, "%s: leave with active job", __func__);

		pm_runtime_mark_last_busy(inst->dev->dev);

		pm_runtime_put_autosuspend(inst->dev->dev);

		return;

	default:

		WARN(1, "Execution of a job in state %s is invalid.\n",
@@ -1498,6 +1511,8 @@ static void wave5_vpu_enc_device_run(void *priv) 
		break;

	}

	dev_dbg(inst->dev->dev, "%s: leave and finish job", __func__);

	pm_runtime_mark_last_busy(inst->dev->dev);

	pm_runtime_put_autosuspend(inst->dev->dev);

	v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx);

}
@@ -1739,9 +1754,8 @@ static int wave5_vpu_open_enc(struct file *filp) 
	if (ret)

		goto cleanup_inst;



	if (dev->irq < 0 && !hrtimer_active(&dev->hrtimer) && list_empty(&dev->instances))

		hrtimer_start(&dev->hrtimer, ns_to_ktime(dev->vpu_poll_interval * NSEC_PER_MSEC),

			      HRTIMER_MODE_REL_PINNED);

	if (list_empty(&dev->instances))

		pm_runtime_use_autosuspend(inst->dev->dev);



	list_add_tail(&inst->list, &dev->instances);

drivers/media/platform/chips-media/wave5/wave5-vpu.c

+50 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/clk.h>

#include <linux/firmware.h>

#include <linux/interrupt.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>

#include "wave5-vpu.h"

#include "wave5-regdefine.h"
@@ -153,6 +154,45 @@ static int wave5_vpu_load_firmware(struct device *dev, const char *fw_name, 
	return 0;

}



static __maybe_unused int wave5_pm_suspend(struct device *dev)

{

	struct vpu_device *vpu = dev_get_drvdata(dev);



	if (pm_runtime_suspended(dev))

		return 0;



	if (vpu->irq < 0)

		hrtimer_cancel(&vpu->hrtimer);



	wave5_vpu_sleep_wake(dev, true, NULL, 0);

	clk_bulk_disable_unprepare(vpu->num_clks, vpu->clks);



	return 0;

}



static __maybe_unused int wave5_pm_resume(struct device *dev)

{

	struct vpu_device *vpu = dev_get_drvdata(dev);

	int ret = 0;



	wave5_vpu_sleep_wake(dev, false, NULL, 0);

	ret = clk_bulk_prepare_enable(vpu->num_clks, vpu->clks);

	if (ret) {

		dev_err(dev, "Enabling clocks, fail: %d\n", ret);

		return ret;

	}



	if (vpu->irq < 0 && !hrtimer_active(&vpu->hrtimer))

		hrtimer_start(&vpu->hrtimer, ns_to_ktime(vpu->vpu_poll_interval * NSEC_PER_MSEC),

			      HRTIMER_MODE_REL_PINNED);



	return ret;

}



static const struct dev_pm_ops wave5_pm_ops = {

	SET_RUNTIME_PM_OPS(wave5_pm_suspend, wave5_pm_resume, NULL)

};



static int wave5_vpu_probe(struct platform_device *pdev)

{

	int ret;
@@ -281,6 +321,12 @@ static int wave5_vpu_probe(struct platform_device *pdev) 
		 (match_data->flags & WAVE5_IS_DEC) ? "'DECODE'" : "");

	dev_info(&pdev->dev, "Product Code:      0x%x\n", dev->product_code);

	dev_info(&pdev->dev, "Firmware Revision: %u\n", fw_revision);



	pm_runtime_set_autosuspend_delay(&pdev->dev, 100);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	wave5_vpu_sleep_wake(&pdev->dev, true, NULL, 0);



	return 0;



err_enc_unreg:
@@ -310,6 +356,9 @@ static void wave5_vpu_remove(struct platform_device *pdev) 
		hrtimer_cancel(&dev->hrtimer);

	}



	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	mutex_destroy(&dev->dev_lock);

	mutex_destroy(&dev->hw_lock);

	reset_control_assert(dev->resets);
@@ -337,6 +386,7 @@ static struct platform_driver wave5_vpu_driver = { 
	.driver = {

		.name = VPU_PLATFORM_DEVICE_NAME,

		.of_match_table = of_match_ptr(wave5_dt_ids),

		.pm = &wave5_pm_ops,

		},

	.probe = wave5_vpu_probe,

	.remove_new = wave5_vpu_remove,