diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-04-02 04:44:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-04-02 04:44:39 +1000 |
| commit | a0497251f2b055a137d62ed065286ba999647b3c (patch) | |
| tree | 743ee0d6bb8e8f017b2a8b1633e4b037a2ed3c4b /include/linux | |
| parent | dcdb7aa452ef9503a9a90dc807475e2d5b78ba21 (diff) | |
| parent | ac097aecfef0bb289ca53d2fe0b73fc7e1612a05 (diff) | |
Merge tag 'drm/tegra/for-5.12-rc6' of ssh://git.freedesktop.org/git/tegra/linux into drm-fixes
drm/tegra: Fixes for v5.12-rc6
This contains a couple of fixes for various issues such as lockdep
warnings, runtime PM references, coupled display controllers and
misconfigured PLLs.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210401163352.3348296-1-thierry.reding@gmail.com
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/host1x.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/host1x.h b/include/linux/host1x.h index ce59a6a6a008..9eb77c87a83b 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -320,7 +320,14 @@ static inline struct host1x_device *to_host1x_device(struct device *dev) int host1x_device_init(struct host1x_device *device); int host1x_device_exit(struct host1x_device *device); -int host1x_client_register(struct host1x_client *client); +int __host1x_client_register(struct host1x_client *client, + struct lock_class_key *key); +#define host1x_client_register(class) \ + ({ \ + static struct lock_class_key __key; \ + __host1x_client_register(class, &__key); \ + }) + int host1x_client_unregister(struct host1x_client *client); int host1x_client_suspend(struct host1x_client *client); |