Merge tag 'drm-misc-next-fixes-2021-09-09' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / tegra / drm.h

diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 0cb8680..8b28327 100644 (file)
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -64,12 +64,22 @@ struct tegra_drm {
        struct tegra_display_hub *hub;
 };
 
+static inline struct host1x *tegra_drm_to_host1x(struct tegra_drm *tegra)
+{
+       return dev_get_drvdata(tegra->drm->dev->parent);
+}
+
 struct tegra_drm_client;
 
 struct tegra_drm_context {
        struct tegra_drm_client *client;
        struct host1x_channel *channel;
+
+       /* Only used by legacy UAPI. */
        unsigned int id;
+
+       /* Only used by new UAPI. */
+       struct xarray mappings;
 };
 
 struct tegra_drm_client_ops {
@@ -91,7 +101,9 @@ struct tegra_drm_client {
        struct host1x_client base;
        struct list_head list;
        struct tegra_drm *drm;
+       struct host1x_channel *shared_channel;
 
+       /* Set by driver */
        unsigned int version;
        const struct tegra_drm_client_ops *ops;
 };