summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-07-24 09:38:44 +1000
committerDave Airlie <airlied@redhat.com>2020-07-24 09:38:55 +1000
commit395be0f47a001a975d25a3e2a0bfe4f08ee193fa (patch)
tree3121c15ff8eea8d3dfbe886d2516265e7dfce67c /include
parent41206a073ceebc517245677a19f52ba6379b33a9 (diff)
parent4fba6d22ca9ad28b8871d763b35a4da2e1ca272e (diff)
downloadlinux-stable-395be0f47a001a975d25a3e2a0bfe4f08ee193fa.tar.gz
linux-stable-395be0f47a001a975d25a3e2a0bfe4f08ee193fa.tar.bz2
linux-stable-395be0f47a001a975d25a3e2a0bfe4f08ee193fa.zip
Merge tag 'drm/tegra/for-5.9-rc1' of ssh://git.freedesktop.org/git/tegra/linux into drm-next
drm/tegra: Changes for v5.9-rc1 This set of patches contains a few preparatory patches to enable video capture support from external camera modules. This is a dependency for the V4L2 driver patches that will likely be merged in v5.9 or v5.10. On top of that there are a couple of fixes across the board as well as some improvements. From a feature point of view this also adds support for horizontal reflection and 180° rotation of planes. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thierry Reding <thierry.reding@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200717162011.1661788-1-thierry.reding@gmail.com
Diffstat (limited to 'include')
-rw-r--r--include/linux/host1x.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index a3a568bf9686..20c885d0bddc 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -328,10 +328,12 @@ int host1x_client_resume(struct host1x_client *client);
struct tegra_mipi_device;
-struct tegra_mipi_device *tegra_mipi_request(struct device *device);
+struct tegra_mipi_device *tegra_mipi_request(struct device *device,
+ struct device_node *np);
void tegra_mipi_free(struct tegra_mipi_device *device);
int tegra_mipi_enable(struct tegra_mipi_device *device);
int tegra_mipi_disable(struct tegra_mipi_device *device);
int tegra_mipi_calibrate(struct tegra_mipi_device *device);
+int tegra_mipi_wait(struct tegra_mipi_device *device);
#endif