diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 17:42:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 17:42:03 +0300 |
| commit | d0fa9250317ff6e92a1397ebf7cf4d83014f38a6 (patch) | |
| tree | 34735aae3a17aad235f7acc1b45fe96fba965750 /drivers/video/fbdev/Kconfig | |
| parent | 46d6b7becb1d5a8e697db786590c19e4067a975a (diff) | |
| parent | 54e19d34011fea26d39aa74781131de0ce642a01 (diff) | |
| download | linux-d0fa9250317ff6e92a1397ebf7cf4d83014f38a6.tar.xz | |
Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull Hyper-V updates from Sasha Levin:
- Most of the commits here are work to enable host-initiated
hibernation support by Dexuan Cui.
- Fix for a warning shown when host sends non-aligned balloon requests
by Tianyu Lan.
* tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
hv_utils: Add the support of hibernation
hv_utils: Support host-initiated hibernation request
hv_utils: Support host-initiated restart request
Tools: hv: Reopen the devices if read() or write() returns errors
video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.
Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23)
video: hyperv_fb: Fix hibernation for the deferred IO feature
Input: hyperv-keyboard: Add the support of hibernation
hv_balloon: Balloon up according to request page number
Diffstat (limited to 'drivers/video/fbdev/Kconfig')
| -rw-r--r-- | drivers/video/fbdev/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index aa9541bf964b..f65991a67af2 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2215,6 +2215,7 @@ config FB_HYPERV select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_DEFERRED_IO + select DMA_CMA if HAVE_DMA_CONTIGUOUS && CMA help This framebuffer driver supports Microsoft Hyper-V Synthetic Video. |