diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-12 10:19:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-12 10:30:36 +1000 |
| commit | e0da9686232ca6174a97a73aea8537aed7cd8468 (patch) | |
| tree | 8cc331cca1f0c5337ed7881632d2cd898764cdbb /include | |
| parent | a38fd8748464831584a19438cbb3082b5a2dab15 (diff) | |
| parent | de066e116306baf3a6a62691ac63cfc0b1dabddb (diff) | |
| download | cachepc-linux-e0da9686232ca6174a97a73aea8537aed7cd8468.tar.gz cachepc-linux-e0da9686232ca6174a97a73aea8537aed7cd8468.zip | |
Merge tag 'drm-misc-fixes-2021-03-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for rc3, rebased on rc2:
- Fix oops in drm_fbdev_cleanup()
- unpin qxl bos created as pinned when freeing them,
and make ttm only warn once on this behavior.
- Use LCD management for atyfb on PPC_MAC.
- Use gitlab for drm bugzilla now.
- Fix ttm page pool accounting.
- Zero head.surface_id correctly in qxl.
- Assorted fixes for shmem helpers.
- Shutdown kms poll helper in meson correctly.
- Clear holes when converting compat ioctl's between 32-bits and 64-bits.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4606f08e-d0e8-c543-5e96-cee2fd728a41@linux.intel.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 7d72c4e0713c..d6a41841b93e 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -746,6 +746,8 @@ extern int usb_lock_device_for_reset(struct usb_device *udev, extern int usb_reset_device(struct usb_device *dev); extern void usb_queue_reset_device(struct usb_interface *dev); +extern struct device *usb_intf_get_dma_device(struct usb_interface *intf); + #ifdef CONFIG_ACPI extern int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable); |