From aa2821a42706ac7b69703d1869e2d00a4ced9f4b Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 20 Dec 2010 11:53:53 +1000 Subject: kill NVSync(), it's rather useless Signed-off-by: Ben Skeggs --- src/nv_dma.c | 21 --------------------- src/nv_driver.c | 2 -- src/nv_proto.h | 1 - 3 files changed, 24 deletions(-) diff --git a/src/nv_dma.c b/src/nv_dma.c index 409f42c..49ed40a 100644 --- a/src/nv_dma.c +++ b/src/nv_dma.c @@ -45,27 +45,6 @@ NVChannelHangNotify(struct nouveau_channel *chan) NVLockedUp(pScrn); } -void NVSync(ScrnInfoPtr pScrn) -{ - NVPtr pNv = NVPTR(pScrn); - struct nouveau_channel *chan = pNv->chan; - struct nouveau_grobj *gr = pNv->Nv2D ? pNv->Nv2D : pNv->NvImageBlit; - - if (pNv->NoAccel) - return; - - /* Wait for nvchannel to go completely idle */ - nouveau_notifier_reset(pNv->notify0, 0); - BEGIN_RING(chan, gr, 0x104, 1); - OUT_RING (chan, 0); - BEGIN_RING(chan, gr, 0x100, 1); - OUT_RING (chan, 0); - FIRE_RING (chan); - if (nouveau_notifier_wait_status(pNv->notify0, 0, - NV_NOTIFY_STATE_STATUS_COMPLETED, 2.0)) - NVLockedUp(pScrn); -} - Bool NVInitDma(ScrnInfoPtr pScrn) { diff --git a/src/nv_driver.c b/src/nv_driver.c index ed72194..e2df82e 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -356,8 +356,6 @@ NVLeaveVT(int scrnIndex, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n"); - NVSync(pScrn); - ret = drmDropMaster(nouveau_device(pNv->dev)->fd); if (ret) ErrorF("Error dropping master: %d\n", ret); diff --git a/src/nv_proto.h b/src/nv_proto.h index ba8ca5e..775b094 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -36,7 +36,6 @@ void NVSetPortDefaults (ScrnInfoPtr pScrn, NVPortPrivPtr pPriv); unsigned int nv_window_belongs_to_crtc(ScrnInfoPtr, int, int, int, int); /* in nv_dma.c */ -void NVSync(ScrnInfoPtr pScrn); Bool NVInitDma(ScrnInfoPtr pScrn); void NVTakedownDma(ScrnInfoPtr pScrn); -- cgit v1.2.1