diff options
| author | Thierry Reding <treding@nvidia.com> | 2021-03-30 19:53:03 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2021-03-30 19:53:03 +0200 |
| commit | 01990be33389d59f6b5c7dce0e8580263df1aa0c (patch) | |
| tree | af93d1d5298b783cd031bdee147984a23ce3d2eb /drivers/gpu/host1x/bus.c | |
| parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
| parent | ac097aecfef0bb289ca53d2fe0b73fc7e1612a05 (diff) | |
Merge branch 'drm/tegra/fixes' into drm/tegra/for-next
Diffstat (limited to 'drivers/gpu/host1x/bus.c')
| -rw-r--r-- | drivers/gpu/host1x/bus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 347fb962b6c9..68a766ff0e9d 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -705,8 +705,9 @@ void host1x_driver_unregister(struct host1x_driver *driver) EXPORT_SYMBOL(host1x_driver_unregister); /** - * host1x_client_register() - register a host1x client + * __host1x_client_register() - register a host1x client * @client: host1x client + * @key: lock class key for the client-specific mutex * * Registers a host1x client with each host1x controller instance. Note that * each client will only match their parent host1x controller and will only be @@ -715,13 +716,14 @@ EXPORT_SYMBOL(host1x_driver_unregister); * device and call host1x_device_init(), which will in turn call each client's * &host1x_client_ops.init implementation. */ -int host1x_client_register(struct host1x_client *client) +int __host1x_client_register(struct host1x_client *client, + struct lock_class_key *key) { struct host1x *host1x; int err; INIT_LIST_HEAD(&client->list); - mutex_init(&client->lock); + __mutex_init(&client->lock, "host1x client lock", key); client->usecount = 0; mutex_lock(&devices_lock); @@ -742,7 +744,7 @@ int host1x_client_register(struct host1x_client *client) return 0; } -EXPORT_SYMBOL(host1x_client_register); +EXPORT_SYMBOL(__host1x_client_register); /** * host1x_client_unregister() - unregister a host1x client |