Merge branch 'rework/kthreads' into for-linus

[linux-2.6-microblaze.git] / include / linux / host1x.h

diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index c0bf4e5..cb2100d 100644 (file)
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -327,6 +327,14 @@ struct host1x_job {
 
        /* Whether host1x-side firewall should be ran for this job or not */
        bool enable_firewall;
+
+       /* Options for configuring engine data stream ID */
+       /* Context device to use for job */
+       struct host1x_memory_context *memory_context;
+       /* Stream ID to use if context isolation is disabled (!memory_context) */
+       u32 engine_fallback_streamid;
+       /* Engine offset to program stream ID to */
+       u32 engine_streamid_offset;
 };
 
 struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
@@ -446,4 +454,38 @@ int tegra_mipi_disable(struct tegra_mipi_device *device);
 int tegra_mipi_start_calibration(struct tegra_mipi_device *device);
 int tegra_mipi_finish_calibration(struct tegra_mipi_device *device);
 
+/* host1x memory contexts */
+
+struct host1x_memory_context {
+       struct host1x *host;
+
+       refcount_t ref;
+       struct pid *owner;
+
+       struct device dev;
+       u64 dma_mask;
+       u32 stream_id;
+};
+
+#ifdef CONFIG_IOMMU_API
+struct host1x_memory_context *host1x_memory_context_alloc(struct host1x *host1x,
+                                                         struct pid *pid);
+void host1x_memory_context_get(struct host1x_memory_context *cd);
+void host1x_memory_context_put(struct host1x_memory_context *cd);
+#else
+static inline struct host1x_memory_context *host1x_memory_context_alloc(struct host1x *host1x,
+                                                                       struct pid *pid)
+{
+       return NULL;
+}
+
+static inline void host1x_memory_context_get(struct host1x_memory_context *cd)
+{
+}
+
+static inline void host1x_memory_context_put(struct host1x_memory_context *cd)
+{
+}
+#endif
+
 #endif