frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DRI2: Allow DDX to validate swap_limit changes 

DDX can now implement validation for swap_limit changes to prevent
configurations that are not support in driver.

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
CC: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Pauli Nieminen 2010-11-01 16:02:11 +02:00 committed by Keith Packard
parent b435e2aac1
commit 871d65790e
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/dri2/dri2.c
View File

@ -103,6 +103,7 @@ typedef struct _DRI2Screen {
DRI2ScheduleWaitMSCProcPtr ScheduleWaitMSC; DRI2ScheduleWaitMSCProcPtr ScheduleWaitMSC;
DRI2AuthMagicProcPtr AuthMagic; DRI2AuthMagicProcPtr AuthMagic;
DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify; DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify;
DRI2SwapLimitValidateProcPtr SwapLimitValidate;
HandleExposuresProcPtr HandleExposures; HandleExposuresProcPtr HandleExposures;
@ -196,9 +197,16 @@ Bool
DRI2SwapLimit(DrawablePtr pDraw, int swap_limit) DRI2SwapLimit(DrawablePtr pDraw, int swap_limit)
{ {
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
DRI2ScreenPtr ds;
if (!pPriv) if (!pPriv)
return FALSE; return FALSE;
ds = pPriv->dri2_screen;
if (!ds->SwapLimitValidate
|| !ds->SwapLimitValidate(pDraw, swap_limit))
return FALSE;
pPriv->swap_limit = swap_limit; pPriv->swap_limit = swap_limit;
/* Check throttling */ /* Check throttling */
@ -1156,8 +1164,10 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
ds->AuthMagic = info->AuthMagic; ds->AuthMagic = info->AuthMagic;
} }
if (info->version >= 6) if (info->version >= 6) {
ds->ReuseBufferNotify = info->ReuseBufferNotify; ds->ReuseBufferNotify = info->ReuseBufferNotify;
ds->SwapLimitValidate = info->SwapLimitValidate;
}
/* /*
* if the driver doesn't provide an AuthMagic function or the info struct * if the driver doesn't provide an AuthMagic function or the info struct

14
hw/xfree86/dri2/dri2.h
View File

@ -168,6 +168,19 @@ typedef int (*DRI2ScheduleWaitMSCProcPtr)(ClientPtr client,
typedef void (*DRI2InvalidateProcPtr)(DrawablePtr pDraw, typedef void (*DRI2InvalidateProcPtr)(DrawablePtr pDraw,
void *data); void *data);
/**
* DRI2 calls this hook when ever swap_limit is going to be changed. Default
* implementation for the hook only accepts one as swap_limit. If driver can
* support other swap_limits it has to implement supported limits with this
* callback.
*
* \param pDraw drawable whos swap_limit is going to be changed
* \param swap_limit new swap_limit that going to be set
* \return TRUE if limit is support, FALSE if not.
*/
typedef Bool (*DRI2SwapLimitValidateProcPtr)(DrawablePtr pDraw,
int swap_limit);
/** /**
* Version of the DRI2InfoRec structure defined in this header * Version of the DRI2InfoRec structure defined in this header
*/ */
@ -203,6 +216,7 @@ typedef struct {
/* added in version 6 */ /* added in version 6 */
DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify; DRI2ReuseBufferNotifyProcPtr ReuseBufferNotify;
DRI2SwapLimitValidateProcPtr SwapLimitValidate;
} DRI2InfoRec, *DRI2InfoPtr; } DRI2InfoRec, *DRI2InfoPtr;
extern _X_EXPORT int DRI2EventBase; extern _X_EXPORT int DRI2EventBase;