summaryrefslogtreecommitdiff
path: root/uxa/uxa.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-12-28 13:57:09 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-12-28 13:57:09 +0000
commita5583165da0d2ae5eb1e5a2e11ee6e245d4b5aa4 (patch)
tree1ccce41d9bdaf5fb57e59de541bb5e7e67e14927 /uxa/uxa.c
parent337635ab97bbfc9b4455eadb63214783bb90bb2b (diff)
uxa: Remove concept of global FB ownership made obsolete by GEM and KMS
With the introduction of GEM, we can continue to submit batch buffers irrespective of ownership of the console, so do so. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'uxa/uxa.c')
-rw-r--r--uxa/uxa.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/uxa/uxa.c b/uxa/uxa.c
index 5b3d7097..d912b033 100644
--- a/uxa/uxa.c
+++ b/uxa/uxa.c
@@ -333,21 +333,6 @@ static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix)
return ret;
}
-static void uxa_xorg_enable_disable_fb_access(int index, Bool enable)
-{
- ScreenPtr screen = screenInfo.screens[index];
- uxa_screen_t *uxa_screen = uxa_get_screen(screen);
-
- if (!enable && uxa_screen->disableFbCount++ == 0)
- uxa_screen->swappedOut = TRUE;
-
- if (enable && --uxa_screen->disableFbCount == 0)
- uxa_screen->swappedOut = FALSE;
-
- if (uxa_screen->SavedEnableDisableFBAccess)
- uxa_screen->SavedEnableDisableFBAccess(index, enable);
-}
-
void uxa_set_fallback_debug(ScreenPtr screen, Bool enable)
{
uxa_screen_t *uxa_screen = uxa_get_screen(screen);
@@ -453,7 +438,6 @@ uxa_driver_t *uxa_driver_alloc(void)
Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver)
{
uxa_screen_t *uxa_screen;
- ScrnInfoPtr scrn = xf86Screens[screen->myNum];
if (!uxa_driver)
return FALSE;
@@ -533,9 +517,6 @@ Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver)
uxa_screen->SavedBitmapToRegion = screen->BitmapToRegion;
screen->BitmapToRegion = uxa_bitmap_to_region;
- uxa_screen->SavedEnableDisableFBAccess = scrn->EnableDisableFBAccess;
- scrn->EnableDisableFBAccess = uxa_xorg_enable_disable_fb_access;
-
#ifdef RENDER
{
PictureScreenPtr ps = GetPictureScreenIfSet(screen);