Merge commit 'origin/master' into modesetting-gem

[profile/ivi/libdrm.git] / shared-core / r300_cmdbuf.c

diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
index 7546e83..05a76ef 100644 (file)
--- a/shared-core/r300_cmdbuf.c
+++ b/shared-core/r300_cmdbuf.c
@@ -811,13 +811,13 @@ static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
        RING_LOCALS;
 
        cache_z = R300_ZC_FLUSH;
-       cache_2d = R300_RB2D_DC_FLUSH;
-       cache_3d = R300_RB3D_DC_FLUSH;
+       cache_2d = R300_DC_FLUSH_2D;
+       cache_3d = R300_DC_FLUSH_3D;
        if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) {
                /* we can purge, primitive where draw since last purge */
                cache_z |= R300_ZC_FREE;
-               cache_2d |= R300_RB2D_DC_FREE;
-               cache_3d |= R300_RB3D_DC_FREE;
+               cache_2d |= R300_DC_FREE_2D;
+               cache_3d |= R300_DC_FREE_3D;
        }
 
        /* flush & purge zbuffer */
@@ -861,12 +861,12 @@ static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
  * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must
  * be careful about how this function is called.
  */
-static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
+static void r300_discard_buffer(struct drm_device * dev, struct drm_master *master, struct drm_buf * buf)
 {
-       drm_radeon_private_t *dev_priv = dev->dev_private;
        drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+       struct drm_radeon_master_private *master_priv = master->driver_priv;
 
-       buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
+       buf_priv->age = ++master_priv->sarea_priv->last_dispatch;
        buf->pending = 1;
        buf->used = 0;
 }
@@ -1027,6 +1027,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                      drm_radeon_kcmd_buffer_t *cmdbuf)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
+       struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;
        struct drm_device_dma *dma = dev->dma;
        struct drm_buf *buf = NULL;
        int emit_dispatch_age = 0;
@@ -1133,7 +1134,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                        }
 
                        emit_dispatch_age = 1;
-                       r300_discard_buffer(dev, buf);
+                       r300_discard_buffer(dev, file_priv->master, buf);
                        break;
 
                case R300_CMD_WAIT:
@@ -1188,7 +1189,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
 
                /* Emit the vertex buffer age */
                BEGIN_RING(2);
-               RADEON_DISPATCH_AGE(dev_priv->sarea_priv->last_dispatch);
+               RADEON_DISPATCH_AGE(master_priv->sarea_priv->last_dispatch);
                ADVANCE_RING();
        }