diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 07:24:29 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 08:20:00 +0200 |
| commit | b3beb167af0de6d7cb03aed0687eca645cfd06a6 (patch) | |
| tree | 2699384f75536511e57a862b206c83b4405fa197 /drivers/gpu/drm/nouveau/nv40_grctx.c | |
| parent | drm/nouveau: move ramht code out of nouveau_object.c, nothing to see here (diff) | |
| download | linux-b3beb167af0de6d7cb03aed0687eca645cfd06a6.tar.xz linux-b3beb167af0de6d7cb03aed0687eca645cfd06a6.zip | |
drm/nouveau: modify object accessors, offset in bytes rather than dwords
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv40_grctx.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv40_grctx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv40_grctx.c b/drivers/gpu/drm/nouveau/nv40_grctx.c index 9b5c97469588..ce585093264e 100644 --- a/drivers/gpu/drm/nouveau/nv40_grctx.c +++ b/drivers/gpu/drm/nouveau/nv40_grctx.c @@ -596,13 +596,13 @@ nv40_graph_construct_shader(struct nouveau_grctx *ctx) offset += 0x0280/4; for (i = 0; i < 16; i++, offset += 2) - nv_wo32(dev, obj, offset, 0x3f800000); + nv_wo32(obj, offset * 4, 0x3f800000); for (vs = 0; vs < vs_nr; vs++, offset += vs_len) { for (i = 0; i < vs_nr_b0 * 6; i += 6) - nv_wo32(dev, obj, offset + b0_offset + i, 0x00000001); + nv_wo32(obj, (offset + b0_offset + i) * 4, 0x00000001); for (i = 0; i < vs_nr_b1 * 4; i += 4) - nv_wo32(dev, obj, offset + b1_offset + i, 0x3f800000); + nv_wo32(obj, (offset + b1_offset + i) * 4, 0x3f800000); } } |