diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-15 10:05:03 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-15 15:41:52 +0100 |
commit | 18d5ae3bd9075ac1a2ee21b071ac133e2e634b62 (patch) | |
tree | 82e60e279e52956df3c4d4f124c8d489d2ed106d /src/radeon_dri2.c | |
parent | 248e912c487636d7352cfad43c03fc9f19fc2215 (diff) |
radeon: drop all UMS/DRI1/XAA/overlay support.
This overhauls the radeon driver and removes all the old UMS-only code,
it drops all the UMS, DRI1, XAA, overlay Xv, video capture, tv tuners
There are probably a lot more cleanups that will fall out of this afterwards.
So far this is compile/build tested.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/radeon_dri2.c')
-rw-r--r-- | src/radeon_dri2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index 43514b7b..8c24de90 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -49,7 +49,6 @@ #endif #endif -#ifdef RADEON_DRI2 #include "radeon_bo_gem.h" @@ -1319,11 +1318,6 @@ radeon_dri2_screen_init(ScreenPtr pScreen) Bool scheduling_works = TRUE; #endif - if (!info->useEXA) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DRI2 requires EXA\n"); - return FALSE; - } - info->dri2.device_name = drmGetDeviceNameFromFd(info->dri2.drm_fd); if ( (info->ChipFamily >= CHIP_FAMILY_R600) ) { @@ -1349,7 +1343,7 @@ radeon_dri2_screen_init(ScreenPtr pScreen) dri2_info.CopyRegion = radeon_dri2_copy_region; #ifdef USE_DRI2_SCHEDULING - if (info->dri->pKernelDRMVersion->version_minor < 4) { + if (info->dri2.pKernelDRMVersion->version_minor < 4) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "You need a newer kernel for " "sync extension\n"); scheduling_works = FALSE; @@ -1426,4 +1420,3 @@ void radeon_dri2_close_screen(ScreenPtr pScreen) drmFree(info->dri2.device_name); } -#endif |