[PATCH] drm/radeon: allow geom rings to be setup on r600/r700

[Alex Deucher]

I made some minor cleanups and also added a missing 7xx reg to the
safe regs list.

Alex

On Wed, Jan 29, 2014 at 11:11 PM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> the evergreen CS parser has allowed this for a while, just port
> the code to the r600 one.
>
> This is required before geom shaders can be made work.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  drivers/gpu/drm/radeon/r600_cs.c    | 18 ++++++++++++++++--
>  drivers/gpu/drm/radeon/radeon_drv.c |  3 ++-
>  2 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
> index 7b399dc..98e1f6b 100644
> --- a/drivers/gpu/drm/radeon/r600_cs.c
> +++ b/drivers/gpu/drm/radeon/r600_cs.c
> @@ -1007,8 +1007,22 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
>         case R_008C64_SQ_VSTMP_RING_SIZE:
>         case R_0288C8_SQ_GS_VERT_ITEMSIZE:
>                 /* get value to populate the IB don't remove */
> -               tmp =radeon_get_ib_value(p, idx);
> -               ib[idx] = 0;
> +         //            tmp =radeon_get_ib_value(p, idx);
> +         //            ib[idx] = 0;
> +               break;
> +       case SQ_ESGS_RING_BASE:
> +       case SQ_GSVS_RING_BASE:
> +       case SQ_ESTMP_RING_BASE:
> +       case SQ_GSTMP_RING_BASE:
> +       case SQ_PSTMP_RING_BASE:
> +       case SQ_VSTMP_RING_BASE:
> +               r = radeon_cs_packet_next_reloc(p, &reloc, 0);
> +               if (r) {
> +                       dev_warn(p->dev, "bad SET_CONTEXT_REG "
> +                                       "0x%04X\n", reg);
> +                       return -EINVAL;
> +               }
> +               ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
>                 break;
>         case SQ_CONFIG:
>                 track->sq_config = radeon_get_ib_value(p, idx);
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index ec8c388..357cffb 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -78,9 +78,10 @@
>   *   2.34.0 - Add CIK tiling mode array query
>   *   2.35.0 - Add CIK macrotile mode array query
>   *   2.36.0 - Fix CIK DCE tiling setup
> + *   2.37.0 - allow ring setup on r6xx/r7xx
>   */
>  #define KMS_DRIVER_MAJOR       2
> -#define KMS_DRIVER_MINOR       36
> +#define KMS_DRIVER_MINOR       37
>  #define KMS_DRIVER_PATCHLEVEL  0
>  int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
>  int radeon_driver_unload_kms(struct drm_device *dev);
> --
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-drm-radeon-allow-geom-rings-to-be-setup-on-r600-r700.patch
Type: text/x-patch
Size: 2851 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140130/78f39f83/attachment.bin>