diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 00:45:33 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-10-15 00:45:33 +1100 |
| commit | bc2c2728b030cb91661af36a2406d1999cf8d632 (patch) | |
| tree | 4d1dbdafb5b3601f565794c26a06c77541471d8c | |
| parent | 690a8fe65943b74f4f19e97c98ce0ec94a9a22ac (diff) | |
require libnouveau_drm 0.0.109.1
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/nouveau_xv.c | 3 | ||||
| -rw-r--r-- | src/nv10_exa.c | 2 | ||||
| -rw-r--r-- | src/nv30_exa.c | 2 | ||||
| -rw-r--r-- | src/nv30_xv_tex.c | 4 | ||||
| -rw-r--r-- | src/nv_type.h | 8 |
6 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 3304ad0..be5c46c 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(LIBNOUVEAU_DRM, libnouveau_drm) +PKG_CHECK_MODULES(LIBNOUVEAU_DRM, libnouveau_drm = 0.0.109.1) AC_SUBST(LIBNOUVEAU_DRM_CFLAGS) AC_SUBST(LIBNOUVEAU_DRM_LIBS) diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c index 3b56237..faf411e 100644 --- a/src/nouveau_xv.c +++ b/src/nouveau_xv.c @@ -1054,7 +1054,8 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, /* If we have no GART at all... */ if (!destination_buffer) { if (pNv->Architecture >= NV_ARCH_50) { - NOUVEAU_ERR("No scratch buffer for tiled upload\n"); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "No scratch buffer for tiled upload\n"); return BadAlloc; } diff --git a/src/nv10_exa.c b/src/nv10_exa.c index 5dadb34..7074d86 100644 --- a/src/nv10_exa.c +++ b/src/nv10_exa.c @@ -1044,7 +1044,7 @@ NVAccelInitNV10TCL(ScrnInfoPtr pScrn) OUT_RING (chan, 0); BEGIN_RING(chan, celcius, NV10TCL_CULL_FACE_ENABLE, 1); OUT_RING (chan, 0); - BEGIN_RING(chan, celcius, NV10TCL_CLIP_PLANE_ENABLE(0), 8); + BEGIN_RING(chan, celcius, NV10TCL_TX_GEN_S(0), 8); for (i=0;i<8;i++) { OUT_RING (chan, 0); } diff --git a/src/nv30_exa.c b/src/nv30_exa.c index 0e09919..63a2e06 100644 --- a/src/nv30_exa.c +++ b/src/nv30_exa.c @@ -311,7 +311,7 @@ NV30EXATexture(ScrnInfoPtr pScrn, PixmapPtr pPix, PicturePtr pPict, int unit) OUT_RING (chan, NV34TCL_TX_FORMAT_DIMS_2D | (fmt->card_fmt << NV34TCL_TX_FORMAT_FORMAT_SHIFT) | - (1 << NV34TCL_TX_FORMAT_MIPMAP_LEVELS_SHIFT) | + (1 << 16) | (log2i(pPix->drawable.width) << NV34TCL_TX_FORMAT_BASE_SIZE_U_SHIFT) | (log2i(pPix->drawable.height) << NV34TCL_TX_FORMAT_BASE_SIZE_V_SHIFT) | 8 | diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c index 329bc0b..569cefd 100644 --- a/src/nv30_xv_tex.c +++ b/src/nv30_xv_tex.c @@ -160,7 +160,7 @@ NV30VideoTexture(ScrnInfoPtr pScrn, struct nouveau_bo *src, int offset, OUT_RELOCl(chan, src, offset, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD); if (unit==0) { OUT_RELOCd(chan, pNv->FB, NV34TCL_TX_FORMAT_DIMS_1D | card_fmt | - (1 << NV34TCL_TX_FORMAT_MIPMAP_LEVELS_SHIFT) | + (1 << 16) | (log2i(width) << NV34TCL_TX_FORMAT_BASE_SIZE_U_SHIFT) | (log2i(height) << @@ -173,7 +173,7 @@ NV30VideoTexture(ScrnInfoPtr pScrn, struct nouveau_bo *src, int offset, NV34TCL_TX_WRAP_R_CLAMP_TO_EDGE); } else { OUT_RELOCd(chan, pNv->FB, NV34TCL_TX_FORMAT_DIMS_2D | card_fmt | - (1 << NV34TCL_TX_FORMAT_MIPMAP_LEVELS_SHIFT) | + (1 << 16) | (log2i(width) << NV34TCL_TX_FORMAT_BASE_SIZE_U_SHIFT) | (log2i(height) << diff --git a/src/nv_type.h b/src/nv_type.h index 6a2598b..639dc9c 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -607,10 +607,10 @@ typedef struct _NVPortPrivRec { #define TIMER_MASK (OFF_TIMER | FREE_TIMER) -#if 0 -#define NOUVEAU_FALLBACK(fmt,args...) do { \ - NOUVEAU_ERR("FALLBACK: "fmt, ##args); \ - return FALSE; \ +#if 1 +#define NOUVEAU_FALLBACK(fmt,args...) do { \ + fprintf(stderr, "FALLBACK: "fmt, ##args); \ + return FALSE; \ } while(0) #else #define NOUVEAU_FALLBACK(fmt,args...) do { \ |