diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 03:23:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 03:23:58 +0300 |
| commit | befad944e2312c18d855013ce154ca7d2b110ade (patch) | |
| tree | 544f38cb6d0a2a35794a33cf9e37396787e7bea1 /include | |
| parent | 010bd965f9711f801f2902ec3a6a2826c6656491 (diff) | |
| parent | bdf800c6fdf5674999bc0228d5040cc0ae218fa8 (diff) | |
| download | linux-befad944e2312c18d855013ce154ca7d2b110ade.tar.xz | |
Merge tag 'drm-fixes-2018-10-05' of git://anongit.freedesktop.org/drm/drm
Dave writes:
"amdgpu and two core fixes
Two fixes for amdgpu:
one corrects a use of process->mm
one fix for display code race condition that can result in a crash
Two core fixes:
One for a use-after-free in the leasing code
One for a cma/fbdev crash."
* tag 'drm-fixes-2018-10-05' of git://anongit.freedesktop.org/drm/drm:
drm/amdkfd: Fix incorrect use of process->mm
drm/amd/display: Signal hw_done() after waiting for flip_done()
drm/cma-helper: Fix crash in fbdev error path
drm: fix use-after-free read in drm_mode_create_lease_ioctl()
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_client.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h index 989f8e52864d..971bb7853776 100644 --- a/include/drm/drm_client.h +++ b/include/drm/drm_client.h @@ -87,9 +87,10 @@ struct drm_client_dev { struct drm_file *file; }; -int drm_client_new(struct drm_device *dev, struct drm_client_dev *client, - const char *name, const struct drm_client_funcs *funcs); +int drm_client_init(struct drm_device *dev, struct drm_client_dev *client, + const char *name, const struct drm_client_funcs *funcs); void drm_client_release(struct drm_client_dev *client); +void drm_client_add(struct drm_client_dev *client); void drm_client_dev_unregister(struct drm_device *dev); void drm_client_dev_hotplug(struct drm_device *dev); |