summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-03-29 05:37:37 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-03-29 05:37:37 +0200
commitf56b4d2185f083fa8861132f3decbf62dffdcf27 (patch)
tree9409e3d18c3b2cf2cf77d5ed05dd87f8bfd69898
parenta986d64a0bf4e3d6d2fab0ce1794c244e982ed22 (diff)
.
-rw-r--r--nvlib.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/nvlib.h b/nvlib.h
index 45f0033..e12c9c7 100644
--- a/nvlib.h
+++ b/nvlib.h
@@ -1137,6 +1137,8 @@ struct nv_channel {
struct nv_channel_direct : public nv_channel
{
+ uint32_t put;
+
nv_channel_direct(struct nv_device* dev, int channel)
: nv_channel(dev, channel)
{
@@ -1144,8 +1146,7 @@ struct nv_channel_direct : public nv_channel
virtual void wait_idle()
{
- uint32_t get, put;
- put = dev->rd_put(channel);
+ uint32_t get;
while(get != put)
get = dev->rd_get(channel);
}
@@ -1162,7 +1163,6 @@ struct nv_channel_vram : public nv_channel_direct
uint32_t vram_ctxdma;
uint32_t our_put;
- uint32_t put;
nv_channel_vram(struct nv_device* dev, int channel)
: nv_channel_direct(dev, channel)
@@ -1222,7 +1222,6 @@ struct nv_channel_parasite : public nv_channel_direct
{
std::unique_ptr<nv_object> dmaobj;
uint32_t dmactx;
- uint32_t put;
uint32_t our_put;
uint32_t orig_getput;
nv_channel_runner* runner;