30c30
< __FBSDID("$FreeBSD: head/sys/dev/drm/radeon_state.c 189499 2009-03-07 21:36:57Z rnoland $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm/radeon_state.c 196470 2009-08-23 14:55:57Z rnoland $");
1544c1544
< static void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_buf *buf)
---
> void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_buf *buf)
2205c2205,2208
< radeon_cp_dispatch_swap(dev);
---
> if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
> r600_cp_dispatch_swap(dev);
> else
> radeon_cp_dispatch_swap(dev);
2402c2405,2408
< ret = radeon_cp_dispatch_texture(dev, file_priv, tex, &image);
---
> if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
> ret = r600_cp_dispatch_texture(dev, file_priv, tex, &image);
> else
> ret = radeon_cp_dispatch_texture(dev, file_priv, tex, &image);
3158a3165,3172
> if (dev->dev_private) {
> drm_radeon_private_t *dev_priv = dev->dev_private;
>
> if (dev_priv->sarea_priv &&
> dev_priv->sarea_priv->pfCurrentPage != 0)
> radeon_cp_dispatch_flip(dev);
> }
>
3219c3233,3234
< DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH)
---
> DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_RADEON_CS, radeon_cs_ioctl, DRM_AUTH)