summaryrefslogtreecommitdiff
path: root/include/video
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-01-05 11:33:24 +1000
committerDave Airlie <airlied@redhat.com>2018-01-05 11:33:24 +1000
commitb0caa1333b6d2d928a00304e9fb6674526c37b79 (patch)
treeabf7bff1f61e5443aee51803ecef48e5a71e4490 /include/video
parentbcd21a4786eae9f661acf552463fb718b24ee5f4 (diff)
parent4cfea3c1f2718d945ca44c1aaac47d8d513c4478 (diff)
Merge tag 'imx-drm-next-2018-01-02' of git://git.pengutronix.de/git/pza/linux into drm-next
drm/imx: format modifier support - Add tiled prefetch support to PRE - Add format modifier support to PRG and imx-drm-core - Use runtime PM to control PRG clock - Allow building ipu-v3 under COMPILE_TEST * tag 'imx-drm-next-2018-01-02' of git://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: allow to build with COMPILE_TEST drm/imx: advertise supported plane format modifiers drm/imx: add FB modifier support gpu: ipu-v3: prg: add modifier support gpu: ipu-v3: pre: add tiled prefetch support gpu: ipu-v3: prg: switch to runtime PM
Diffstat (limited to 'include/video')
-rw-r--r--include/video/imx-ipu-v3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index ce4c07688b13..abbad94e14a1 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -344,7 +344,7 @@ void ipu_prg_channel_disable(struct ipuv3_channel *ipu_chan);
int ipu_prg_channel_configure(struct ipuv3_channel *ipu_chan,
unsigned int axi_id, unsigned int width,
unsigned int height, unsigned int stride,
- u32 format, unsigned long *eba);
+ u32 format, uint64_t modifier, unsigned long *eba);
/*
* IPU CMOS Sensor Interface (csi) functions