xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

xen: Stop abusing DT of_dma_configure API

Selaa lähdekoodia 
As the removed comments say, these aren't DT based devices.
of_dma_configure() is going to stop allowing a NULL DT node and calling
it will no longer work.

The comment is also now out of date as of commit 9ab91e7c5c ("arm64:
default to the direct mapping in get_arch_dma_ops"). Direct mapping
is now the default rather than dma_dummy_ops.

According to Stefano and Oleksandr, the only other part needed is
setting the DMA masks and there's no reason to restrict the masks to
32-bits. So set the masks to 64 bits.

Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
This commit is contained in:
Rob Herring
2019-10-08 14:41:55 -05:00
committed by Boris Ostrovsky
vanhempi 574878f98c
commit ee7f5225dc
2 muutettua tiedostoa jossa 4 lisäystä ja 21 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/xen/xen_drm_front.c
Näytä tiedosto

@@ -716,17 +716,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;
}