Notifier can live in system memory or VRAM, hence they must be accessed using the bo wrapper functions.
Remove the redundant member nouveau_channel::m2mf_ntfy_map. Signed-off-by: Pekka Paalanen <[email protected]> --- drivers/gpu/drm/nouveau/nouveau_dma.c | 2 -- drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index e315f01..a555a5d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -62,8 +62,6 @@ nouveau_dma_init(struct nouveau_channel *chan) ret = nouveau_bo_map(chan->notifier_bo); if (ret) return ret; - chan->m2mf_ntfy_map = chan->notifier_bo->kmap.virtual; - chan->m2mf_ntfy_map += chan->m2mf_ntfy; } /* Initialise DMA vars */ diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index eb32532..9d71ff5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -215,7 +215,6 @@ struct nouveau_channel /* GPU object info for stuff used in-kernel (mm_enabled) */ uint32_t m2mf_ntfy; - volatile uint32_t *m2mf_ntfy_map; uint32_t vram_handle; uint32_t gart_handle; bool accel_done; diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index d6b4dd2..c72bcc4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -73,12 +73,13 @@ nouveau_fbcon_sync(struct fb_info *info) OUT_RING (chan, 0); BEGIN_RING(chan, 0, 0x0100, 1); OUT_RING (chan, 0); - chan->m2mf_ntfy_map[3] = 0xffffffff; + nouveau_bo_wr32(chan->notifier_bo, chan->m2mf_ntfy + 3, 0xffffffff); FIRE_RING (chan); ret = -EBUSY; for (i = 0; i < 100000; i++) { - if (chan->m2mf_ntfy_map[3] == 0) { + if (nouveau_bo_rd32(chan->notifier_bo, chan->m2mf_ntfy + 3) + == 0) { ret = 0; break; } -- 1.6.3.3 _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
