Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:56:09 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_gart.c
Log Message:
GART might not be mapped with bus_dma.
Still need membar and tlb flush in that case.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
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.8 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.8 Mon Aug 27 06:37:00 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c Mon Aug 27 13:56:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_gart.c,v 1.8 2018/08/27 06:37:00 riastradh Exp $ */
+/* $NetBSD: radeon_gart.c,v 1.9 2018/08/27 13:56:09 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.8 2018/08/27 06:37:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_gart.c,v 1.9 2018/08/27 13:56:09 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
@@ -280,11 +280,10 @@ radeon_gart_pre_update(struct radeon_dev
unsigned gpu_npages)
{
- if (rdev->gart.ptr != NULL) {
+ if (rdev->gart.rg_table_map != NULL) {
const unsigned entsize =
rdev->gart.table_size / rdev->gart.num_gpu_pages;
- KASSERT(rdev->gart.rg_table_map != NULL);
bus_dmamap_sync(rdev->ddev->dmat, rdev->gart.rg_table_map,
gpu_pgstart*entsize, gpu_npages*entsize,
BUS_DMASYNC_PREWRITE);
@@ -296,15 +295,16 @@ radeon_gart_post_update(struct radeon_de
unsigned gpu_npages)
{
- if (rdev->gart.ptr != NULL) {
+ if (rdev->gart.rg_table_map != NULL) {
const unsigned entsize =
rdev->gart.table_size / rdev->gart.num_gpu_pages;
- KASSERT(rdev->gart.rg_table_map != NULL);
- membar_sync(); /* XXX overkill */
bus_dmamap_sync(rdev->ddev->dmat, rdev->gart.rg_table_map,
gpu_pgstart*entsize, gpu_npages*entsize,
BUS_DMASYNC_POSTWRITE);
+ }
+ if (rdev->gart.ptr != NULL) {
+ membar_sync(); /* XXX overkill */
radeon_gart_tlb_flush(rdev);
}
}
