summaryrefslogtreecommitdiff
path: root/src/nv_dma.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-11-16 09:18:33 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-11-17 09:53:52 +1100
commit2af4a28ae1df46686e264bcda417a896b7cfa59a (patch)
tree9f6c0906429fa22cb1610a767ad4738dc4b4791b /src/nv_dma.h
parent6e3d05e8c60fd7bab371af86151e45eec0a65b3d (diff)
downloadxorg-driver-xf86-video-nouveau-2af4a28ae1df46686e264bcda417a896b7cfa59a.tar.gz
Hook up DMA funcs to channels/grobjs etc etc
Diffstat (limited to 'src/nv_dma.h')
-rw-r--r--src/nv_dma.h67
1 files changed, 0 insertions, 67 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h
index 39b6bb8..b025f78 100644
--- a/src/nv_dma.h
+++ b/src/nv_dma.h
@@ -1,44 +1,3 @@
-
- /***************************************************************************\
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
-|* international laws. Users and possessors of this source code are *|
-|* hereby granted a nonexclusive, royalty-free copyright license to *|
-|* use this code in individual and commercial software. *|
-|* *|
-|* Any use of this source code must include, in the user documenta- *|
-|* tion and internal comments to the code, notices to the end user *|
-|* as follows: *|
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *|
-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *|
-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *|
-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *|
-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *|
-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *|
-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *|
-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *|
-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *|
-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *|
-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *|
-|* *|
-|* U.S. Government End Users. This source code is a "commercial *|
-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *|
-|* consisting of "commercial computer software" and "commercial *|
-|* computer software documentation," as such terms are used in *|
-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *|
-|* ment only as a commercial end item. Consistent with 48 C.F.R. *|
-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *|
-|* all U.S. Government End Users acquire the source code with only *|
-|* those rights set forth herein. *|
-|* *|
- \***************************************************************************/
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.4 2004/03/20 01:52:16 mvojkovi Exp $ */
#ifndef NV_DMA_H
#define NV_DMA_H
@@ -73,30 +32,4 @@ enum DMAObjects {
NvDmaXvNotifier5 = 0xE8000005,
};
-extern void NVDmaStartNNN(NVPtr pNv, uint32_t object, uint32_t tag, int size);
-
-#define BEGIN_RING(obj,mthd,size) do { \
- NVDmaStartNNN(pNv, (obj), (mthd), (size)); \
-} while(0)
-
-#define OUT_RING(data) do { \
- NVDEBUG("\tOUT_RING : @0x%08x 0x%08x\n", \
- (unsigned)(pNv->dmaCurrent), (unsigned)(data)); \
- pNv->dmaBase[pNv->dmaCurrent++] = (data); \
-} while(0)
-
-#define OUT_RINGf(data) do { \
- union { float v; uint32_t u; } c; \
- c.v = (data); \
- OUT_RING(c.u); \
-} while(0)
-
-#define WAIT_RING(size) do { \
- NVDmaWaitNNN(pScrn, (size)); \
-} while(0)
-
-#define FIRE_RING() do { \
- NVDmaKickoffNNN(pNv); \
-} while(0)
-
#endif /* NV_DMA_H */