diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-03-29 19:47:21 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-04-14 02:07:57 +1000 |
commit | 4896c87484e1cf1e5421de377b6b83890948664d (patch) | |
tree | 178d6d363c4422f08fc22ce3a8112140bc8bd7a5 | |
parent | 4225b486cb8ab98d27ba23874096ff0879d45575 (diff) |
nvc0: switch to kepler's subchannel assignments (see note)
This will bust for kernels with nouveau ABI version < 1.0.0... It should
be possible to add compat for 0.0.16 however...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | src/nvc0_accel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvc0_accel.h b/src/nvc0_accel.h index bdd7677..9a7475a 100644 --- a/src/nvc0_accel.h +++ b/src/nvc0_accel.h @@ -9,15 +9,15 @@ #include "hwdefs/nv50_texture.h" #include "hwdefs/nv_3ddefs.xml.h" -/* subchannel assignments */ -#define SUBC_M2MF(mthd) 0, (mthd) +/* subchannel assignments, compatible with kepler's fixed layout */ +#define SUBC_3D(mthd) 0, (mthd) +#define NVC0_3D(mthd) SUBC_3D(NVC0_3D_##mthd) +#define SUBC_M2MF(mthd) 2, (mthd) #define NVC0_M2MF(mthd) SUBC_M2MF(NVC0_M2MF_##mthd) -#define SUBC_NVSW(mthd) 1, (mthd) -#define SUBC_2D(mthd) 2, (mthd) +#define SUBC_2D(mthd) 3, (mthd) #define NV50_2D(mthd) SUBC_2D(NV50_2D_##mthd) #define NVC0_2D(mthd) SUBC_2D(NVC0_2D_##mthd) -#define SUBC_3D(mthd) 7, (mthd) -#define NVC0_3D(mthd) SUBC_3D(NVC0_3D_##mthd) +#define SUBC_NVSW(mthd) 5, (mthd) /* scratch buffer offsets */ #define CODE_OFFSET 0x00000 /* Code */ |