summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-03-29 05:43:25 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-03-29 05:43:25 +0200
commitc4598c615aa3a9f7d0ef1c4231cff0b2885128eb (patch)
treee4db43b66e1e74b2ebaa167a429000b518e69f4e
parentf56b4d2185f083fa8861132f3decbf62dffdcf27 (diff)
.
-rw-r--r--nvlib.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nvlib.h b/nvlib.h
index e12c9c7..51d0555 100644
--- a/nvlib.h
+++ b/nvlib.h
@@ -1176,7 +1176,7 @@ struct nv_channel_vram : public nv_channel_direct
vram_handle = entry.handle;
/* the middle of vram is hopefully away from anything critical */
- our_put = put = dev->vram_mappable_size / 2;
+ our_put = dev->vram_mappable_size / 2;
}
virtual void outp(void* buf, int dwords)
@@ -1189,8 +1189,8 @@ struct nv_channel_vram : public nv_channel_direct
{
if(put != our_put) {
if(!taken) {
- wait_idle();
orig_getput = dev->rd_put(channel);
+ put = our_put;
orig_ctxdma = dev->ramfc->fc[channel]->rd32(dev->ramfc->fc_fifo) << 4;
if(dev->card_type < NV_40)