diff options
Diffstat (limited to 'src/nv50_xv.c')
| -rw-r--r-- | src/nv50_xv.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/nv50_xv.c b/src/nv50_xv.c index 3522dde..1c6e5be 100644 --- a/src/nv50_xv.c +++ b/src/nv50_xv.c @@ -108,13 +108,7 @@ nv50_xv_image_put(ScrnInfoPtr pScrn, BEGIN_NV04(push, NV50_3D(BLEND_ENABLE(0)), 1); PUSH_DATA (push, 0); - BEGIN_NV04(push, NV50_3D(CB_DEF_ADDRESS_HIGH), 3); - PUSH_DATA (push, (pNv->scratch->offset + TIC_OFFSET) >> 32); - PUSH_DATA (push, (pNv->scratch->offset + TIC_OFFSET)); - PUSH_DATA (push, (CB_TIC << NV50_3D_CB_DEF_SET_BUFFER__SHIFT) | 0x4000); - BEGIN_NV04(push, NV50_3D(CB_ADDR), 1); - PUSH_DATA (push, CB_TIC); - BEGIN_NI04(push, NV50_3D(CB_DATA(0)), 16); + PUSH_DATAu(push, pNv->scratch, TIC_OFFSET, 16); if (id == FOURCC_YV12 || id == FOURCC_I420) { PUSH_DATA (push, NV50TIC_0_0_MAPA_C0 | NV50TIC_0_0_TYPEA_UNORM | NV50TIC_0_0_MAPB_ZERO | NV50TIC_0_0_TYPEB_UNORM | @@ -183,13 +177,7 @@ nv50_xv_image_put(ScrnInfoPtr pScrn, PUSH_DATA (push, 0x00000000); } - BEGIN_NV04(push, NV50_3D(CB_DEF_ADDRESS_HIGH), 3); - PUSH_DATA (push, (pNv->scratch->offset + TSC_OFFSET) >> 32); - PUSH_DATA (push, (pNv->scratch->offset + TSC_OFFSET)); - PUSH_DATA (push, (CB_TSC << NV50_3D_CB_DEF_SET_BUFFER__SHIFT) | 0x4000); - BEGIN_NV04(push, NV50_3D(CB_ADDR), 1); - PUSH_DATA (push, CB_TSC); - BEGIN_NI04(push, NV50_3D(CB_DATA(0)), 16); + PUSH_DATAu(push, pNv->scratch, TSC_OFFSET, 16); PUSH_DATA (push, NV50TSC_1_0_WRAPS_CLAMP_TO_EDGE | NV50TSC_1_0_WRAPT_CLAMP_TO_EDGE | NV50TSC_1_0_WRAPR_CLAMP_TO_EDGE); @@ -342,14 +330,7 @@ nv50_xv_csc_update(ScrnInfoPtr pScrn, NVPortPrivPtr pPriv) NOUVEAU_BO_VRAM }, 1)) return; - BEGIN_NV04(push, NV50_3D(CB_DEF_ADDRESS_HIGH), 3); - PUSH_DATA (push, (pNv->scratch->offset + PFP_DATA) >> 32); - PUSH_DATA (push, (pNv->scratch->offset + PFP_DATA)); - PUSH_DATA (push, (CB_PFP << NV50_3D_CB_DEF_SET_BUFFER__SHIFT) | - 0x00004000); - BEGIN_NV04(push, NV50_3D(CB_ADDR), 1); - PUSH_DATA (push, CB_PFP); - BEGIN_NI04(push, NV50_3D(CB_DATA(0)), 10); + PUSH_DATAu(push, pNv->scratch, PFP_DATA, 10); PUSH_DATAf(push, yco); PUSH_DATAf(push, off[0]); PUSH_DATAf(push, off[1]); |