You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From 159ccf0090f202cf031fa429df22e8b3f775ece8 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Fri, 22 Nov 2019 16:23:32 +0000
|
|
Subject: [PATCH] drm/v3d: Set dma_mask as well as coherent_dma_mask
|
|
|
|
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>
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_drv.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
|
|
@@ -259,8 +259,8 @@ static int v3d_platform_drm_probe(struct
|
|
goto dev_free;
|
|
|
|
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);
|