mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[media] omap3isp: Add set performance callback in isp platform data 

Replace the omap_pm_set_min_bus_tput() with a callback to board code.
This makes the omap3isp driver compilable as a module, and lets board
code manage OMAP PM details depending on board requirements.

Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2011-03-03 10:05:22 -03:00 committed by Mauro Carvalho Chehab
parent 7e8970e1d5
commit 4b0ec19e02
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/omap3isp/isp.h
View File

@ -199,6 +199,7 @@ struct isp_v4l2_subdevs_group {
struct isp_platform_data {
struct isp_v4l2_subdevs_group *subdevs;
void (*set_constraints)(struct isp_device *isp, bool enable);
};
struct isp_platform_callback {

21
drivers/media/video/omap3isp/ispvideo.c
View File

@ -921,18 +921,8 @@ isp_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
pipe->output = far_end;
}
/* Make sure the interconnect clock runs fast enough.
*
* Formula from: resource34xx.c set_opp()
* If MPU freq is above 500MHz, make sure the interconnect
* is at 100Mhz or above.
* throughput in KiB/s for 100 Mhz = 100 * 1000 * 4.
*
* We want to be fast enough then set OCP clock to be max as
* possible, in that case 185Mhz then:
* throughput in KiB/s for 185Mhz = 185 * 1000 * 4 = 740000 KiB/s
*/
omap_pm_set_min_bus_tput(video->isp->dev, OCP_INITIATOR_AGENT, 740000);
if (video->isp->pdata->set_constraints)
video->isp->pdata->set_constraints(video->isp, true);
pipe->l3_ick = clk_get_rate(video->isp->clock[ISP_CLK_L3_ICK]);
/* Validate the pipeline and update its state. */
@ -978,8 +968,8 @@ isp_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
error:
if (ret < 0) {
omap3isp_video_queue_streamoff(&vfh->queue);
omap_pm_set_min_bus_tput(video->isp->dev,
OCP_INITIATOR_AGENT, 0);
if (video->isp->pdata->set_constraints)
video->isp->pdata->set_constraints(video->isp, false);
media_entity_pipeline_stop(&video->video.entity);
video->queue = NULL;
}
@ -1032,7 +1022,8 @@ isp_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
video->queue = NULL;
video->streaming = 0;
omap_pm_set_min_bus_tput(video->isp->dev, OCP_INITIATOR_AGENT, 0);
if (video->isp->pdata->set_constraints)
video->isp->pdata->set_constraints(video->isp, false);
media_entity_pipeline_stop(&video->video.entity);
done: