xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'for-linus-5.4-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Browse Source 
Pull xen fixes from Juergen Gross:

 - correct panic handling when running as a Xen guest

 - cleanup the Xen grant driver to remove printing a pointer being
   always NULL

 - remove a soon to be wrong call of of_dma_configure()

* tag 'for-linus-5.4-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Stop abusing DT of_dma_configure API
  xen/grant-table: remove unnecessary printing
  x86/xen: Return from panic notifier
This commit is contained in:
Linus Torvalds
2019-10-12 14:11:21 -07:00
parent f154988a90 ee7f5225dc
commit 680b5b3c5d
5 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/xen/xen_drm_front.c
View File

@@ -718,17 +718,9 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
struct device *dev = &xb_dev->dev;
int ret;
/*
* The device is not spawn from a device tree, so arch_setup_dma_ops
* is not called, thus leaving the device with dummy DMA ops.
* This makes the device return error on PRIME buffer import, which
* is not correct: to fix this call of_dma_configure() with a NULL
* node to set default DMA ops.
*/
dev->coherent_dma_mask = DMA_BIT_MASK(32);
ret = of_dma_configure(dev, NULL, true);
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
if (ret < 0) {
DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
DRM_ERROR("Cannot setup DMA mask, ret %d", ret);
return ret;
}