diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-07-10 22:31:13 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 09:46:14 -0400 |
| commit | a6561f2ec673b38907f7181235386f32e60c32ba (patch) | |
| tree | aa3a85089159e5079a0eee0ac437485415b51b34 /src/radeon_exa_funcs.c | |
| parent | 75ef8dc214715d3c5c50996b293933842903ba65 (diff) | |
Move DRI to a separate struct
based on Matthias' similar work in rhd
Diffstat (limited to 'src/radeon_exa_funcs.c')
| -rw-r--r-- | src/radeon_exa_funcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index 783e83dc..2be9a8de 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -401,7 +401,7 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h, int swap = RADEON_HOST_DATA_SWAP_NONE, wpass = w * bpp / 8; int hpass = min(h, scratch->total/2 / scratch_pitch); uint32_t scratch_pitch_offset = scratch_pitch << 16 - | (info->gartLocation + info->bufStart + | (info->gartLocation + info->dri->bufStart + scratch->idx * scratch->total) >> 10; drmRadeonIndirect indirect; ACCEL_PREAMBLE(); @@ -450,7 +450,7 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h, * we'd really need is a way to reliably wait for the host interface * to be done with pushing the data to the host. */ - while ((drmCommandNone(info->drmFD, DRM_RADEON_CP_IDLE) == -EBUSY) + while ((drmCommandNone(info->dri->drmFD, DRM_RADEON_CP_IDLE) == -EBUSY) && (i++ < RADEON_TIMEOUT)) ; @@ -473,7 +473,7 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h, indirect.start = indirect.end = 0; indirect.discard = 1; - drmCommandWriteRead(info->drmFD, DRM_RADEON_INDIRECT, + drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_INDIRECT, &indirect, sizeof(drmRadeonIndirect)); info->accel_state->exaMarkerSynced = info->accel_state->exaSyncMarker; |