diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-04-10 08:15:48 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-04-10 08:15:48 +0000 |
| commit | e375a3dc10eb8945e05577df8b40072dfffaba81 (patch) | |
| tree | dc50125a62407230a26972c87a5ca9794bd1764a /linux/i830_dma.c | |
| parent | 23ec8875fce631e4554a72161937dca735c2d675 (diff) | |
patch from Andrew Morton tree from Arjan van de Ven fixes some oopses seen
with 4G/4G split
Diffstat (limited to 'linux/i830_dma.c')
| -rw-r--r-- | linux/i830_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/i830_dma.c b/linux/i830_dma.c index 626f84bed..c2fd8c262 100644 --- a/linux/i830_dma.c +++ b/linux/i830_dma.c @@ -1173,17 +1173,17 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev, if (buf_priv->currently_mapped == I830_BUF_MAPPED) { u32 *vp = buf_priv->virtual; - vp[0] = (GFX_OP_PRIMITIVE | + DRM_PUT_USER_UNCHECKED(&vp[0], (GFX_OP_PRIMITIVE | sarea_priv->vertex_prim | - ((used/4)-2)); + ((used/4)-2))); if (dev_priv->use_mi_batchbuffer_start) { - vp[used/4] = MI_BATCH_BUFFER_END; + DRM_PUT_USER_UNCHECKED(&vp[used/4], MI_BATCH_BUFFER_END); used += 4; } if (used & 4) { - vp[used/4] = 0; + DRM_PUT_USER_UNCHECKED(&vp[used/4], 0); used += 4; } |