[Nouveau] [PATCH 2/5] nvc0: make use of the new hwdefs for TEX_CB_INDEX

[Samuel Pitoiset]

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 10/16/2016 09:14 PM, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/nvc0_accel.c | 2 +-
>  src/nvc0_accel.h | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c
> index 52a17db..0682806 100644
> --- a/src/nvc0_accel.c
> +++ b/src/nvc0_accel.c
> @@ -313,7 +313,7 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
>  		PUSH_DATA (push, 0x00000001);
>  		BEGIN_NVC0(push, NVC0_3D(CB_BIND(4)), 1);
>  		PUSH_DATA (push, 0x11);
> -		BEGIN_NVC0(push, SUBC_3D(0x2608), 1);
> +		BEGIN_NVC0(push, NVE4_3D(TEX_CB_INDEX), 1);
>  		PUSH_DATA (push, 1);
>  	}
>
> diff --git a/src/nvc0_accel.h b/src/nvc0_accel.h
> index 4c3bb0f..607e97b 100644
> --- a/src/nvc0_accel.h
> +++ b/src/nvc0_accel.h
> @@ -12,6 +12,7 @@
>  /* subchannel assignments, compatible with kepler's fixed layout  */
>  #define SUBC_3D(mthd)    0, (mthd)
>  #define NVC0_3D(mthd)    SUBC_3D(NVC0_3D_##mthd)
> +#define NVE4_3D(mthd)    SUBC_3D(NVE4_3D_##mthd)
>  #define SUBC_M2MF(mthd)  2, (mthd)
>  #define SUBC_P2MF(mthd)  2, (mthd)
>  #define NVC0_M2MF(mthd)  SUBC_M2MF(NVC0_M2MF_##mthd)
>

-- 
-Samuel