Patch from Thomas Winischhofer to kick out all pixmaps to system ram upon a
VT switch and vice versa when returning.
This commit is contained in:
parent
327741486e
commit
3c92389185
15
exa/exa.c
15
exa/exa.c
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -253,6 +253,26 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
|
|||
exaOffscreenInit (pScreen);
|
||||
}
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable)
|
||||
{
|
||||
ScreenPtr pScreen = screenInfo.screens[index];
|
||||
ExaScreenPriv (pScreen);
|
||||
|
||||
if (!enable) {
|
||||
ExaOffscreenSwapOut (pScreen);
|
||||
pExaScr->swappedOut = TRUE;
|
||||
}
|
||||
|
||||
if (pExaScr->SavedEnableDisableFBAccess)
|
||||
(*pExaScr->SavedEnableDisableFBAccess)(index, enable);
|
||||
|
||||
if (enable) {
|
||||
ExaOffscreenSwapIn (pScreen);
|
||||
pExaScr->swappedOut = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* merge the next free area into this one */
|
||||
static void
|
||||
ExaOffscreenMerge (ExaOffscreenArea *area)
|
||||
|
|
|
@ -44,11 +44,15 @@
|
|||
#include "dix.h"
|
||||
#include "fb.h"
|
||||
#include "fboverlay.h"
|
||||
#ifdef RENDER
|
||||
#include "fbpict.h"
|
||||
#endif
|
||||
|
||||
#ifndef EXA_MAX_FB
|
||||
#define EXA_MAX_FB FB_OVERLAY_MAX
|
||||
#endif
|
||||
|
||||
typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
|
||||
typedef struct {
|
||||
ExaDriverPtr info;
|
||||
CreateGCProcPtr SavedCreateGC;
|
||||
|
@ -63,6 +67,9 @@ typedef struct {
|
|||
#ifdef RENDER
|
||||
CompositeProcPtr SavedComposite;
|
||||
#endif
|
||||
EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
|
||||
Bool wrappedEnableDisableFB;
|
||||
Bool swappedOut;
|
||||
} ExaScreenPrivRec, *ExaScreenPrivPtr;
|
||||
|
||||
/*
|
||||
|
@ -225,6 +232,9 @@ ExaOffscreenSwapIn (ScreenPtr pScreen);
|
|||
void
|
||||
ExaOffscreenFini (ScreenPtr pScreen);
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable);
|
||||
|
||||
/* exa.c */
|
||||
void
|
||||
exaPixmapUseScreen (PixmapPtr pPixmap);
|
||||
|
|
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -44,11 +44,15 @@
|
|||
#include "dix.h"
|
||||
#include "fb.h"
|
||||
#include "fboverlay.h"
|
||||
#ifdef RENDER
|
||||
#include "fbpict.h"
|
||||
#endif
|
||||
|
||||
#ifndef EXA_MAX_FB
|
||||
#define EXA_MAX_FB FB_OVERLAY_MAX
|
||||
#endif
|
||||
|
||||
typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
|
||||
typedef struct {
|
||||
ExaDriverPtr info;
|
||||
CreateGCProcPtr SavedCreateGC;
|
||||
|
@ -63,6 +67,9 @@ typedef struct {
|
|||
#ifdef RENDER
|
||||
CompositeProcPtr SavedComposite;
|
||||
#endif
|
||||
EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
|
||||
Bool wrappedEnableDisableFB;
|
||||
Bool swappedOut;
|
||||
} ExaScreenPrivRec, *ExaScreenPrivPtr;
|
||||
|
||||
/*
|
||||
|
@ -225,6 +232,9 @@ ExaOffscreenSwapIn (ScreenPtr pScreen);
|
|||
void
|
||||
ExaOffscreenFini (ScreenPtr pScreen);
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable);
|
||||
|
||||
/* exa.c */
|
||||
void
|
||||
exaPixmapUseScreen (PixmapPtr pPixmap);
|
||||
|
|
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -331,9 +331,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
ExaPixmapPrivPtr pExaPixmap;
|
||||
int bpp;
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
ExaScreenPriv(pScreen);
|
||||
|
||||
if (!pScrn->vtSema) {
|
||||
ExaScreenPriv(pScreen);
|
||||
if (!pScrn->vtSema || pExaScr->swappedOut) {
|
||||
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
|
||||
} else {
|
||||
bpp = BitsPerPixel (depth);
|
||||
|
@ -1127,6 +1127,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
#ifdef RENDER
|
||||
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
||||
#endif
|
||||
ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
|
||||
|
||||
pScreen->CreateGC = pExaScr->SavedCreateGC;
|
||||
pScreen->CloseScreen = pExaScr->SavedCloseScreen;
|
||||
|
@ -1142,6 +1143,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
|
|||
ps->Composite = pExaScr->SavedComposite;
|
||||
}
|
||||
#endif
|
||||
if (pExaScr->wrappedEnableDisableFB)
|
||||
pScrn->EnableDisableFBAccess = pExaScr->SavedEnableDisableFBAccess;
|
||||
|
||||
xfree (pExaScr);
|
||||
|
||||
|
@ -1152,6 +1155,8 @@ Bool
|
|||
exaDriverInit (ScreenPtr pScreen,
|
||||
ExaDriverPtr pScreenInfo)
|
||||
{
|
||||
/* Do NOT use XF86SCRNINFO macro here!! */
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
ExaScreenPrivPtr pExaScr;
|
||||
|
||||
#ifdef RENDER
|
||||
|
@ -1165,7 +1170,7 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
exaGeneration = serverGeneration;
|
||||
}
|
||||
|
||||
pExaScr = xalloc (sizeof (ExaScreenPrivRec));
|
||||
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
|
||||
|
||||
if (!pExaScr)
|
||||
return FALSE;
|
||||
|
@ -1233,6 +1238,10 @@ exaDriverInit (ScreenPtr pScreen,
|
|||
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
|
||||
if (!exaOffscreenInit (pScreen))
|
||||
return FALSE;
|
||||
|
||||
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
|
||||
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;
|
||||
pExaScr->wrappedEnableDisableFB = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -253,6 +253,26 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
|
|||
exaOffscreenInit (pScreen);
|
||||
}
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable)
|
||||
{
|
||||
ScreenPtr pScreen = screenInfo.screens[index];
|
||||
ExaScreenPriv (pScreen);
|
||||
|
||||
if (!enable) {
|
||||
ExaOffscreenSwapOut (pScreen);
|
||||
pExaScr->swappedOut = TRUE;
|
||||
}
|
||||
|
||||
if (pExaScr->SavedEnableDisableFBAccess)
|
||||
(*pExaScr->SavedEnableDisableFBAccess)(index, enable);
|
||||
|
||||
if (enable) {
|
||||
ExaOffscreenSwapIn (pScreen);
|
||||
pExaScr->swappedOut = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* merge the next free area into this one */
|
||||
static void
|
||||
ExaOffscreenMerge (ExaOffscreenArea *area)
|
||||
|
|
|
@ -44,11 +44,15 @@
|
|||
#include "dix.h"
|
||||
#include "fb.h"
|
||||
#include "fboverlay.h"
|
||||
#ifdef RENDER
|
||||
#include "fbpict.h"
|
||||
#endif
|
||||
|
||||
#ifndef EXA_MAX_FB
|
||||
#define EXA_MAX_FB FB_OVERLAY_MAX
|
||||
#endif
|
||||
|
||||
typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
|
||||
typedef struct {
|
||||
ExaDriverPtr info;
|
||||
CreateGCProcPtr SavedCreateGC;
|
||||
|
@ -63,6 +67,9 @@ typedef struct {
|
|||
#ifdef RENDER
|
||||
CompositeProcPtr SavedComposite;
|
||||
#endif
|
||||
EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
|
||||
Bool wrappedEnableDisableFB;
|
||||
Bool swappedOut;
|
||||
} ExaScreenPrivRec, *ExaScreenPrivPtr;
|
||||
|
||||
/*
|
||||
|
@ -225,6 +232,9 @@ ExaOffscreenSwapIn (ScreenPtr pScreen);
|
|||
void
|
||||
ExaOffscreenFini (ScreenPtr pScreen);
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable);
|
||||
|
||||
/* exa.c */
|
||||
void
|
||||
exaPixmapUseScreen (PixmapPtr pPixmap);
|
||||
|
|
|
@ -253,6 +253,26 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
|
|||
exaOffscreenInit (pScreen);
|
||||
}
|
||||
|
||||
void
|
||||
exaEnableDisableFBAccess (int index, Bool enable)
|
||||
{
|
||||
ScreenPtr pScreen = screenInfo.screens[index];
|
||||
ExaScreenPriv (pScreen);
|
||||
|
||||
if (!enable) {
|
||||
ExaOffscreenSwapOut (pScreen);
|
||||
pExaScr->swappedOut = TRUE;
|
||||
}
|
||||
|
||||
if (pExaScr->SavedEnableDisableFBAccess)
|
||||
(*pExaScr->SavedEnableDisableFBAccess)(index, enable);
|
||||
|
||||
if (enable) {
|
||||
ExaOffscreenSwapIn (pScreen);
|
||||
pExaScr->swappedOut = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* merge the next free area into this one */
|
||||
static void
|
||||
ExaOffscreenMerge (ExaOffscreenArea *area)
|
||||
|
|
Loading…
Reference in New Issue
Block a user