Module Name: src
Committed By: riastradh
Date: Wed Aug 8 22:16:49 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)
...
(Preemptive pullup from my DRM/KMS update branch in Git.)
XXX pullup-7
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.5 Sat Jul 26 05:45:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c Wed Aug 8 22:16:49 2018
@@ -268,7 +268,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);
}
}
@@ -284,7 +284,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);
}
radeon_gart_tlb_flush(rdev);
}
