History

Merge tag 'drm/tegra/for-5.6-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v5.6-rc1 This contains a small set of mostly fixes and some minor improvements. Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 6 years ago

Commit fd7226f2 parents 688486a 033ccdb17 files · +593 −352Browse files

Showing the changes to include/linux (1 of 17 files). Show all

Unified · Split

include/linux/host1x.h+13−2
@@ -24,16 +24,20 @@ struct iommu_group; · 23 unmodified lines
24 * struct host1x_client_ops - host1x client operations24 * struct host1x_client_ops - host1x client operations
25 * @init: host1x client initialization code25 * @init: host1x client initialization code
26 * @exit: host1x client tear down code26 * @exit: host1x client tear down code
27 * @suspend: host1x client suspend code
28 * @resume: host1x client resume code
27 */29 */
28struct host1x_client_ops {30struct host1x_client_ops {
29 int (*init)(struct host1x_client *client);31 int (*init)(struct host1x_client *client);
30 int (*exit)(struct host1x_client *client);32 int (*exit)(struct host1x_client *client);
33 int (*suspend)(struct host1x_client *client);
34 int (*resume)(struct host1x_client *client);
31};35};
32 36
33/**37/**
34 * struct host1x_client - host1x client structure38 * struct host1x_client - host1x client structure
35 * @list: list node for the host1x client39 * @list: list node for the host1x client
36 * @parent: pointer to struct device representing the host1x controller40 * @host: pointer to struct device representing the host1x controller
37 * @dev: pointer to struct device backing this host1x client41 * @dev: pointer to struct device backing this host1x client
38 * @group: IOMMU group that this client is a member of42 * @group: IOMMU group that this client is a member of
39 * @ops: host1x client operations43 * @ops: host1x client operations
@@ -44,7 +48,7 @@ struct host1x_client_ops { · 4 unmodified lines
44 */48 */
45struct host1x_client {49struct host1x_client {
46 struct list_head list;50 struct list_head list;
47 struct device *parent;51 struct device *host;
48 struct device *dev;52 struct device *dev;
49 struct iommu_group *group;53 struct iommu_group *group;
50 54
@@ -55,6 +59,10 @@ struct host1x_client { · 4 unmodified lines
55 59
56 struct host1x_syncpt **syncpts;60 struct host1x_syncpt **syncpts;
57 unsigned int num_syncpts;61 unsigned int num_syncpts;
62
63 struct host1x_client *parent;
64 unsigned int usecount;
65 struct mutex lock;
58};66};
59 67
60/*68/*
@@ -309,6 +317,9 @@ int host1x_device_exit(struct host1x_device *device); · 248 unmodified lines
309int host1x_client_register(struct host1x_client *client);317int host1x_client_register(struct host1x_client *client);
310int host1x_client_unregister(struct host1x_client *client);318int host1x_client_unregister(struct host1x_client *client);
311 319
320int host1x_client_suspend(struct host1x_client *client);
321int host1x_client_resume(struct host1x_client *client);
322
312struct tegra_mipi_device;323struct tegra_mipi_device;
313 324
314struct tegra_mipi_device *tegra_mipi_request(struct device *device);325struct tegra_mipi_device *tegra_mipi_request(struct device *device);