diff options
| author | Eric Anholt <eric@anholt.net> | 2008-09-09 10:57:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-09-09 19:18:10 -0700 |
| commit | 0b4f7b630312b148ce4e172cb7cd9f673751b2a3 (patch) | |
| tree | 9da6e6cf6f6e486131c481330f2e0221581340b2 /src | |
| parent | 0f804bfa1e1e972e9b4e3b7c8db61e9877c50f50 (diff) | |
Track move of bufmgr functions to libdrm_intel.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/drmmode_display.h | 2 | ||||
| -rw-r--r-- | src/i830.h | 1 | ||||
| -rw-r--r-- | src/i830_batchbuffer.h | 4 | ||||
| -rw-r--r-- | src/i830_dri.c | 2 | ||||
| -rw-r--r-- | src/i830_memory.c | 6 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 97feea41..8966bd68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_ladir = @moduledir@/drivers intel_drv_la_LIBADD = -lm ../uxa/libuxa.la if XSERVER_LIBPCIACCESS -intel_drv_la_LIBADD += @PCIACCESS_LIBS@ +intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@ -ldrm_intel endif XMODE_SRCS=\ diff --git a/src/drmmode_display.h b/src/drmmode_display.h index fc7c1df1..ee51c955 100644 --- a/src/drmmode_display.h +++ b/src/drmmode_display.h @@ -29,7 +29,7 @@ #ifdef XF86DRM_MODE -#include "dri_bufmgr.h" +#include "intel_bufmgr.h" #include "xf86drmMode.h" typedef struct { @@ -79,7 +79,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include "drmmode_display.h" #endif -#include "dri_bufmgr.h" #include "intel_bufmgr.h" #include "i915_drm.h" diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h index 2a23cae3..3c7a69be 100644 --- a/src/i830_batchbuffer.h +++ b/src/i830_batchbuffer.h @@ -68,8 +68,8 @@ intel_batch_emit_reloc (I830Ptr pI830, { assert(intel_batch_space(pI830) >= 4); *(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = bo->offset + delta; - intel_bo_emit_reloc (pI830->batch_bo, read_domains, write_domains, delta, - pI830->batch_used, bo); + dri_bo_emit_reloc(pI830->batch_bo, read_domains, write_domains, delta, + pI830->batch_used, bo); pI830->batch_used += 4; } diff --git a/src/i830_dri.c b/src/i830_dri.c index ca3bc621..d0682712 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1542,7 +1542,7 @@ i830_name_buffer (ScrnInfoPtr pScrn, i830_memory *mem) if (!mem->gem_name) { int ret; - ret = intel_bo_flink(mem->bo, &mem->gem_name); + ret = dri_bo_flink(mem->bo, &mem->gem_name); if (ret != 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, diff --git a/src/i830_memory.c b/src/i830_memory.c index 443cc4e5..2cbdd17a 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -167,7 +167,7 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) #ifdef XF86DRI if (mem->bo != NULL) { - if (intel_bo_pin (mem->bo, mem->alignment) != 0) { + if (dri_bo_pin(mem->bo, mem->alignment) != 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to pin %s: %s\n", mem->name, strerror(errno)); @@ -214,7 +214,7 @@ i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem) #ifdef XF86DRI if (mem->bo != NULL) { - if (intel_bo_unpin (mem->bo) == 0) { + if (dri_bo_unpin(mem->bo) == 0) { mem->bound = FALSE; /* Give buffer obviously wrong offset/end until it's re-pinned. */ mem->offset = -1; @@ -897,7 +897,7 @@ i830_allocate_memory_tiled(ScrnInfoPtr pScrn, const char *name, else tiling_mode = I915_TILING_Y; - ret = intel_bo_set_tiling (mem->bo, &tiling_mode); + ret = dri_bo_set_tiling(mem->bo, &tiling_mode); if (ret != 0 || tiling_mode == I915_TILING_NONE) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set tiling on %s: %s\n", |