diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-15 13:08:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-15 13:08:23 +0100 |
| commit | 9e714c3f0e6afe1131fed6db18ea5d5190652492 (patch) | |
| tree | 23d504f485e60a1e660158fdd9b09228ab4641d7 | |
| parent | fa3acc3f364cd855af98e2c6e59730fd8ede65c2 (diff) | |
| download | gst-plugins-fsl-vpu-9e714c3f0e6afe1131fed6db18ea5d5190652492.tar.gz gst-plugins-fsl-vpu-9e714c3f0e6afe1131fed6db18ea5d5190652492.tar.xz | |
make module compile with v3.3-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | module/imx-vpu.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/module/imx-vpu.c b/module/imx-vpu.c index 93c2028..63adede 100644 --- a/module/imx-vpu.c +++ b/module/imx-vpu.c @@ -67,6 +67,14 @@ #define VPU_MAX_BITRATE 32767 +#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 0, 0) +static inline dma_addr_t +vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no) +{ + return vb2_dma_contig_plane_dma_addr(vb, 0); +} +#endif + static unsigned int vpu_bitrate; module_param(vpu_bitrate, uint, 0644); MODULE_PARM_DESC(vpu_bitrate, "bitrate: Specify bitrate for encoder. " @@ -1528,10 +1536,15 @@ static int frame_calc_size(int width, int height) #endif return (width * height * 3) / 2; } - +#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 1, 0) +static int vpu_vb2_setup(struct vb2_queue *q, const struct v4l2_format *fmt, + unsigned int *count, unsigned int *num_planes, + unsigned int sizes[], void *alloc_ctxs[]) +#else static int vpu_vb2_setup(struct vb2_queue *q, unsigned int *count, unsigned int *num_planes, unsigned long sizes[], void *alloc_ctxs[]) +#endif { struct vpu_instance *instance = vb2_get_drv_priv(q); struct vpu *vpu = instance->vpu; |