OSDN Git Service

drm/omap: ensure we have a valid dma_mask
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 9 Aug 2019 10:00:38 +0000 (13:00 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 12 Aug 2019 13:16:34 +0000 (16:16 +0300)
commit63daf4e166545363f3b875f5b81aecb46e1e1d19
treeba7577119c7e1f7b3eb4df546c8abdd84f47349c
parent181ae8844578d0a80f188c1d195fd6bb91bcec81
drm/omap: ensure we have a valid dma_mask

The omapdrm driver uses dma_set_coherent_mask(), but that's not enough
anymore when LPAE is enabled.

From Christoph Hellwig <hch@lst.de>:

> The traditional arm DMA code ignores, but the generic dma-direct/swiotlb
> has stricter checks and thus fails mappings without a DMA mask.  As we
> use swiotlb for arm with LPAE now, omapdrm needs to catch up and
> actually set a DMA mask.

Change the dma_set_coherent_mask() call to
dma_coerce_mask_and_coherent() so that the dev->dma_mask is also set.

Fixes: ad3c7b18c5b3 ("arm: use swiotlb for bounce buffering on LPAE configs")
Reported-by: "H. Nikolaus Schaller" <hns@goldelico.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c219e7e6-0f66-d6fd-e0cf-59c803386825@ti.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
drivers/gpu/drm/omapdrm/omap_drv.c