Skip to content

Commit 9f61419

Browse files
committed
drm/msm: Use the correct dma_sync calls harder
Looks like the dma_sync calls don't do what we want on armv7 either. Fixes: Unable to handle kernel paging request at virtual address 50001000 pgd = (ptrval) [50001000] *pgd=00000000 Internal error: Oops: 805 [rib#1] SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.3.0-rc6-00271-g9f159ae07f07 rib#4 Hardware name: Freescale i.MX53 (Device Tree Support) PC is at v7_dma_clean_range+0x20/0x38 LR is at __dma_page_cpu_to_dev+0x28/0x90 pc : [<c011c76c>] lr : [<c01181c4>] psr: 20000013 sp : d80b5a88 ip : de96c000 fp : d840ce6c r10: 00000000 r9 : 00000001 r8 : d843e010 r7 : 00000000 r6 : 00008000 r5 : ddb6c000 r4 : 00000000 r3 : 0000003f r2 : 00000040 r1 : 50008000 r0 : 50001000 Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: 70004019 DAC: 00000051 Process swapper/0 (pid: 1, stack limit = 0x(ptrval)) Signed-off-by: Rob Clark <[email protected]> Fixes: 3de433c ("drm/msm: Use the correct dma_sync calls in msm_gem") Tested-by: Fabio Estevam <[email protected]>
1 parent c044e86 commit 9f61419

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/msm/msm_gem.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static void sync_for_device(struct msm_gem_object *msm_obj)
5252
{
5353
struct device *dev = msm_obj->base.dev->dev;
5454

55-
if (get_dma_ops(dev)) {
55+
if (get_dma_ops(dev) && IS_ENABLED(CONFIG_ARM64)) {
5656
dma_sync_sg_for_device(dev, msm_obj->sgt->sgl,
5757
msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
5858
} else {
@@ -65,7 +65,7 @@ static void sync_for_cpu(struct msm_gem_object *msm_obj)
6565
{
6666
struct device *dev = msm_obj->base.dev->dev;
6767

68-
if (get_dma_ops(dev)) {
68+
if (get_dma_ops(dev) && IS_ENABLED(CONFIG_ARM64)) {
6969
dma_sync_sg_for_cpu(dev, msm_obj->sgt->sgl,
7070
msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
7171
} else {

0 commit comments

Comments
 (0)