diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-12-10 01:45:40 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-10 01:45:40 +0100 |
| commit | 96f774106ed48808a5e314741e3414c617d14460 (patch) | |
| tree | a0beee162eeaf4813495ee28d3cfdd06effbc8be /drivers/gpu/drm/drm_internal.h | |
| parent | sbitmap: silence bogus lockdep IRQ warning (diff) | |
| parent | Linux 4.20-rc6 (diff) | |
| download | linux-96f774106ed48808a5e314741e3414c617d14460.tar.xz linux-96f774106ed48808a5e314741e3414c617d14460.zip | |
Merge tag 'v4.20-rc6' into for-4.21/block
Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/gpu/drm/drm_internal.h')
| -rw-r--r-- | drivers/gpu/drm/drm_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 0c4eb4a9ab31..51e06defc8d8 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -104,6 +104,8 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor); int drm_sysfs_connector_add(struct drm_connector *connector); void drm_sysfs_connector_remove(struct drm_connector *connector); +void drm_sysfs_lease_event(struct drm_device *dev); + /* drm_gem.c */ int drm_gem_init(struct drm_device *dev); void drm_gem_destroy(struct drm_device *dev); |