Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:56:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_gart.c
Log Message:
Fix ordering of bus_dmamap_sync.
The ordering is:
...
- driver writes to kernel pointer
- sync
- driver triggers device use of newly written data (*)
- sync
- driver writes to kernel pointer
- sync
...
The operation (*) is a DMA write. Hence the syncs should be:
...
- driver writes to kernel pointer
- bus_dmamap_sync(BUS_DMASYNC_PREWRITE)
- driver triggers device use of newly written data
- bus_dmamap_sync(BUS_DMASYNC_POSTWRITE)
- bus_dmamap_sync(BUS_DMASYNC_PREWRITE)
- driver writes to kernel pointer
- bus_dmamap_sync(BUS_DMASYNC_POSTWRITE)
- bus_dmamap_sync(BUS_DMASYNC_PREWRITE)
...
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.9 Mon Aug 27 13:56:09 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c Mon Aug 27 13:56:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_gart.c,v 1.9 2018/08/27 13:56:09 riastradh Exp $ */
+/* $NetBSD: radeon_gart.c,v 1.10 2018/08/27 13:56:22 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_gart.c,v 1.9 2018/08/27 13:56:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_gart.c,v 1.10 2018/08/27 13:56:22 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
@@ -286,7 +286,7 @@ radeon_gart_pre_update(struct radeon_dev
bus_dmamap_sync(rdev->ddev->dmat, rdev->gart.rg_table_map,
gpu_pgstart*entsize, gpu_npages*entsize,
- BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_POSTWRITE);
}
}
@@ -301,7 +301,7 @@ radeon_gart_post_update(struct radeon_de
bus_dmamap_sync(rdev->ddev->dmat, rdev->gart.rg_table_map,
gpu_pgstart*entsize, gpu_npages*entsize,
- BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_PREWRITE);
}
if (rdev->gart.ptr != NULL) {
membar_sync(); /* XXX overkill */
