summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-07-08 09:11:18 +0200
committerMichel Dänzer <daenzer@vmware.com>2009-07-08 09:11:18 +0200
commitf718dd794477fbdd5eeb4183f43ff25517c63034 (patch)
tree717f0d929816896279708542a6d162b722f563b5
parent42e76d0b24b76fbcc6b08a4ea5003dbec368645c (diff)
Don't set EXA UploadTo/DownloadFromScreen hooks when they'd always return FALSE.
-rw-r--r--src/radeon_exa_funcs.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 11dde5a4..d2152287 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -368,9 +368,6 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
TRACE;
- if (info->kms_enabled)
- return FALSE;
-
if (bpp < 8)
return FALSE;
@@ -446,9 +443,6 @@ RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
TRACE;
- if (info->kms_enabled)
- return FALSE;
-
/*
* Try to accelerate download. Use an indirect buffer as scratch space,
* blitting the bits to one half while copying them out of the other one and
@@ -570,9 +564,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
info->accel_state->exa->MarkSync = FUNC_NAME(RADEONMarkSync);
info->accel_state->exa->WaitMarker = FUNC_NAME(RADEONSync);
#ifdef ACCEL_CP
- info->accel_state->exa->UploadToScreen = RADEONUploadToScreenCP;
- if (info->accelDFS)
- info->accel_state->exa->DownloadFromScreen = RADEONDownloadFromScreenCP;
+ if (!info->kms_enabled) {
+ info->accel_state->exa->UploadToScreen = RADEONUploadToScreenCP;
+ if (info->accelDFS)
+ info->accel_state->exa->DownloadFromScreen = RADEONDownloadFromScreenCP;
+ }
#endif
#if X_BYTE_ORDER == X_BIG_ENDIAN