diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-12 12:59:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-12 12:59:18 +1000 |
| commit | fd686668289258ffaf6b81057545e50612aac6a8 (patch) | |
| tree | 4417f0941e90838e28a9a16c22834cba5231688c | |
| parent | 5a9865d90c23c4ce0f46d380ea9119eac87a99eb (diff) | |
radeon: fixup non-kms build
| -rw-r--r-- | src/r600_exa.c | 2 | ||||
| -rw-r--r-- | src/radeon_exa_shared.c | 5 | ||||
| -rw-r--r-- | src/radeon_exa_shared.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c index 911dba08..d6e98ff7 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -72,7 +72,6 @@ R600SetAccelState(ScrnInfoPtr pScrn, { RADEONInfoPtr info = RADEONPTR(pScrn); struct radeon_accel_state *accel_state = info->accel_state; - int ret; if (src0) { memcpy(&accel_state->src_obj[0], src0, sizeof(struct r600_accel_object)); @@ -127,6 +126,7 @@ R600SetAccelState(ScrnInfoPtr pScrn, accel_state->ps_size = 512; #if defined(XF86DRM_MODE) if (info->cs) { + int ret; accel_state->vs_mc_addr = vs_offset; accel_state->ps_mc_addr = ps_offset; diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c index 94ebe355..d1926f4e 100644 --- a/src/radeon_exa_shared.c +++ b/src/radeon_exa_shared.c @@ -177,6 +177,7 @@ void radeon_vb_no_space(ScrnInfoPtr pScrn, int vert_size) RADEONInfoPtr info = RADEONPTR(pScrn); struct radeon_accel_state *accel_state = info->accel_state; +#if defined(XF86DRM_MODE) if (info->cs) { if (accel_state->vb_bo) { if (accel_state->vb_start_op != accel_state->vb_offset) { @@ -191,7 +192,7 @@ void radeon_vb_no_space(ScrnInfoPtr pScrn, int vert_size) radeon_vbo_get(pScrn); return; } - +#endif if (accel_state->vb_start_op != -1) { accel_state->finish_op(pScrn, vert_size); radeon_cp_start(pScrn); @@ -199,6 +200,7 @@ void radeon_vb_no_space(ScrnInfoPtr pScrn, int vert_size) return; } +#if defined(XF86DRM_MODE) void radeon_ib_discard(ScrnInfoPtr pScrn) { RADEONInfoPtr info = RADEONPTR(pScrn); @@ -232,3 +234,4 @@ void radeon_ib_discard(ScrnInfoPtr pScrn) } } +#endif diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h index ca479693..71068b12 100644 --- a/src/radeon_exa_shared.h +++ b/src/radeon_exa_shared.h @@ -69,6 +69,7 @@ static inline void radeon_add_pixmap(struct radeon_cs *cs, PixmapPtr pPix, int r radeon_cs_space_add_persistent_bo(cs, driver_priv->bo, read_domains, write_domain); } +extern void radeon_ib_discard(ScrnInfoPtr pScrn); #endif /* XF86DRM_MODE */ extern void radeon_vb_discard(ScrnInfoPtr pScrn); @@ -76,5 +77,4 @@ extern int radeon_cp_start(ScrnInfoPtr pScrn); extern void radeon_vb_no_space(ScrnInfoPtr pScrn, int vert_size); extern void radeon_vbo_done_composite(PixmapPtr pDst); -extern void radeon_ib_discard(ScrnInfoPtr pScrn); #endif |