Message ID | 1608755714-18233-3-git-send-email-stefan.wahren@i2se.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/v3d: Minor improvements | expand |
On Wed, 2020-12-23 at 21:35 +0100, Stefan Wahren wrote: > From: Phil Elwell <phil@raspberrypi.org> > > Both coherent_dma_mask and dma_mask act as constraints on allocations > and bounce buffer usage, so be sure to set dma_mask to the appropriate > value otherwise the effective mask could be incorrect. > > Signed-off-by: Phil Elwell <phil@raspberrypi.org> > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > --- Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Regards, Nicolas
On Wed, Dec 23, 2020 at 09:35:12PM +0100, Stefan Wahren wrote: > From: Phil Elwell <phil@raspberrypi.org> > > Both coherent_dma_mask and dma_mask act as constraints on allocations > and bounce buffer usage, so be sure to set dma_mask to the appropriate > value otherwise the effective mask could be incorrect. > > Signed-off-by: Phil Elwell <phil@raspberrypi.org> > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Applied, thanks Maxime
diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 42d401f..99e22be 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -232,8 +232,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) return ret; mmu_debug = V3D_READ(V3D_MMU_DEBUG_INFO); - dev->coherent_dma_mask = - DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH)); + dma_set_mask_and_coherent(dev, + DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH))); v3d->va_width = 30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_VA_WIDTH); ident1 = V3D_READ(V3D_HUB_IDENT1);