mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-24 10:11:26 +03:00
drm/tegra: Merge upstream changes
Merge upstream changes from linux-next, including merged version of new UAPI. Change-Id: I4f591d39e51ac6ab6877a0bd428adf166eca3c55 Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2653095 Tested-by: Jonathan Hunter <jonathanh@nvidia.com> Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com> Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com> GVS: Gerrit_Virtual_Submit
This commit is contained in:
committed by
Laxman Dewangan
parent
a6ff2bcf9e
commit
02b028d02a
@@ -73,7 +73,12 @@ 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 {
|
||||
@@ -95,13 +100,11 @@ 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;
|
||||
|
||||
/* Set by TegraDRM core */
|
||||
struct host1x_channel *shared_channel;
|
||||
};
|
||||
|
||||
static inline struct tegra_drm_client *
|
||||
|
||||
Reference in New Issue
Block a user