raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

rpivid: Switch to new clock api

Browse Source 
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
This commit is contained in:
Dom Cobley
2021-04-19 19:30:26 +01:00
committed by Phil Elwell
parent b33c66c7ee
commit 25486f49bf
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/media/rpivid/rpivid.h
View File

@@ -172,6 +172,7 @@ struct rpivid_dev {
void __iomem *base_h265;
struct clk *clock;
struct clk_request *hevc_req;
struct rpivid_hw_irq_ctrl ic_active1;
struct rpivid_hw_irq_ctrl ic_active2;

11
drivers/staging/media/rpivid/rpivid_video.c
View File

@@ -499,8 +499,8 @@ static int rpivid_start_streaming(struct vb2_queue *vq, unsigned int count)
if (V4L2_TYPE_IS_OUTPUT(vq->type) && dev->dec_ops->start)
ret = dev->dec_ops->start(ctx);
ret = clk_set_rate(dev->clock, max_hevc_clock);
if (ret) {
dev->hevc_req = clk_request_start(dev->clock, max_hevc_clock);
if (!dev->hevc_req) {
dev_err(dev->dev, "Failed to set clock rate\n");
goto out;
}
@@ -520,18 +520,13 @@ static void rpivid_stop_streaming(struct vb2_queue *vq)
{
struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
struct rpivid_dev *dev = ctx->dev;
long min_hevc_clock = clk_round_rate(dev->clock, 0);
int ret;
if (V4L2_TYPE_IS_OUTPUT(vq->type) && dev->dec_ops->stop)
dev->dec_ops->stop(ctx);
rpivid_queue_cleanup(vq, VB2_BUF_STATE_ERROR);
ret = clk_set_rate(dev->clock, min_hevc_clock);
if (ret)
dev_err(dev->dev, "Failed to set minimum clock rate\n");
clk_request_done(dev->hevc_req);
clk_disable_unprepare(dev->clock);
}