diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
| commit | 282f51c3f0e5bc2cedd2f60f458ca2662290d471 (patch) | |
| tree | 3bd89c1d2effcc7b8e1b2b9c805244806b3546bc /src/i830_accel.c | |
| parent | 8a54e3be5c5057fe8e3c52c03401fdada7978c45 (diff) | |
| parent | 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4 (diff) | |
Merge commit 'origin/master' into HEAD
Diffstat (limited to 'src/i830_accel.c')
| -rw-r--r-- | src/i830_accel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/i830_accel.c b/src/i830_accel.c index c6044a56..c935af63 100644 --- a/src/i830_accel.c +++ b/src/i830_accel.c @@ -332,9 +332,13 @@ I830AccelInit(ScreenPtr pScreen) pI830->accel_max_y = 2048; } switch (pI830->accel) { -#ifdef I830_USE_UXA case ACCEL_UXA: +#ifdef I830_USE_UXA return i830_uxa_init(pScreen); +#else + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "UXA not built in, falling back to EXA.\n"); + return I830EXAInit(pScreen); #endif #ifdef I830_USE_EXA case ACCEL_EXA: |