summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-04-22 08:32:51 +1000
committerDave Airlie <airlied@redhat.com>2016-04-22 08:32:51 +1000
commit49047962ecf02d76bdaa378c00a51c9b829ac195 (patch)
tree4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /include/video
parentd57d47735ef5461952ef1dbdd515ebc0ffc5d2cc (diff)
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff)
downloadlinux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.bz2
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915. Linux 4.6-rc3
Diffstat (limited to 'include/video')
-rw-r--r--include/video/imx-ipu-v3.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index eeba75395f7d..ad66589f2ae6 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -194,8 +194,9 @@ int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch,
int ipu_cpmem_set_format_passthrough(struct ipuv3_channel *ch, int width);
void ipu_cpmem_set_yuv_interleaved(struct ipuv3_channel *ch, u32 pixel_format);
void ipu_cpmem_set_yuv_planar_full(struct ipuv3_channel *ch,
- u32 pixel_format, int stride,
- int u_offset, int v_offset);
+ unsigned int uv_stride,
+ unsigned int u_offset,
+ unsigned int v_offset);
void ipu_cpmem_set_yuv_planar(struct ipuv3_channel *ch,
u32 pixel_format, int stride, int height);
int ipu_cpmem_set_fmt(struct ipuv3_channel *ch, u32 drm_fourcc);
@@ -236,7 +237,7 @@ void ipu_dmfc_disable_channel(struct dmfc_channel *dmfc);
int ipu_dmfc_alloc_bandwidth(struct dmfc_channel *dmfc,
unsigned long bandwidth_mbs, int burstsize);
void ipu_dmfc_free_bandwidth(struct dmfc_channel *dmfc);
-int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width);
+void ipu_dmfc_config_wait4eot(struct dmfc_channel *dmfc, int width);
struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipuv3_channel);
void ipu_dmfc_put(struct dmfc_channel *dmfc);