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

modesetting: bump to latest X server compat api. 

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-06-01 12:34:42 +01:00
parent 1c01090f64
commit e07c945ab9
2 changed files with 83 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hw/xfree86/drivers/modesetting/compat-api.h
View File

@ -38,4 +38,57 @@
#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
#endif #endif
#ifndef XF86_SCRN_INTERFACE
#define SCRN_ARG_TYPE int
#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
#define SCREEN_ARG_TYPE int
#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
#define FREE_SCREEN_ARGS_DECL int arg, int flags
#define VT_FUNC_ARGS_DECL int arg, int flags
#define VT_FUNC_ARGS pScrn->scrnIndex, 0
#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
#else
#define SCRN_ARG_TYPE ScrnInfoPtr
#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
#define SCREEN_ARG_TYPE ScreenPtr
#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
#define VT_FUNC_ARGS pScrn
#define XF86_ENABLEDISABLEFB_ARG(x) (x)
#endif
#endif #endif

61
hw/xfree86/drivers/modesetting/driver.c
View File

@ -60,18 +60,17 @@
#include "compat-api.h" #include "compat-api.h"
#include "driver.h" #include "driver.h"
static void AdjustFrame(int scrnIndex, int x, int y, int flags); static void AdjustFrame(ADJUST_FRAME_ARGS_DECL);
static Bool CloseScreen(int scrnIndex, ScreenPtr pScreen); static Bool CloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool EnterVT(int scrnIndex, int flags); static Bool EnterVT(VT_FUNC_ARGS_DECL);
static void Identify(int flags); static void Identify(int flags);
static const OptionInfoRec *AvailableOptions(int chipid, int busid); static const OptionInfoRec *AvailableOptions(int chipid, int busid);
static ModeStatus ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, static ModeStatus ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
int flags); int flags);
static void FreeScreen(int scrnIndex, int flags); static void FreeScreen(FREE_SCREEN_ARGS_DECL);
static void LeaveVT(int scrnIndex, int flags); static void LeaveVT(VT_FUNC_ARGS_DECL);
static Bool SwitchMode(int scrnIndex, DisplayModePtr mode, int flags); static Bool SwitchMode(SWITCH_MODE_ARGS_DECL);
static Bool ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, static Bool ScreenInit(SCREEN_INIT_ARGS_DECL);
char **argv);
static Bool PreInit(ScrnInfoPtr pScrn, int flags); static Bool PreInit(ScrnInfoPtr pScrn, int flags);
static Bool Probe(DriverPtr drv, int flags); static Bool Probe(DriverPtr drv, int flags);
@ -389,14 +388,13 @@ static void dispatch_dirty(ScreenPtr pScreen)
} }
} }
static void msBlockHandler(int i, pointer blockData, pointer pTimeout, static void msBlockHandler(BLOCKHANDLER_ARGS_DECL)
pointer pReadmask)
{ {
ScreenPtr pScreen = screenInfo.screens[i]; SCREEN_PTR(arg);
modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
pScreen->BlockHandler = ms->BlockHandler; pScreen->BlockHandler = ms->BlockHandler;
pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); pScreen->BlockHandler(BLOCKHANDLER_ARGS);
pScreen->BlockHandler = msBlockHandler; pScreen->BlockHandler = msBlockHandler;
if (ms->dirty_enabled) if (ms->dirty_enabled)
dispatch_dirty(pScreen); dispatch_dirty(pScreen);
@ -658,7 +656,7 @@ msShadowInit(ScreenPtr pScreen)
} }
static Bool static Bool
ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ScreenInit(SCREEN_INIT_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
@ -722,7 +720,7 @@ ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
fbPictureInit(pScreen, NULL, 0); fbPictureInit(pScreen, NULL, 0);
if (ms->drmmode.shadow_enable && !msShadowInit(pScreen)) { if (ms->drmmode.shadow_enable && !msShadowInit(pScreen)) {
xf86DrvMsg(scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"shadow fb init failed\n"); "shadow fb init failed\n");
return FALSE; return FALSE;
} }
@ -765,13 +763,13 @@ ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (serverGeneration == 1) if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
return EnterVT(scrnIndex, 1); return EnterVT(VT_FUNC_ARGS);
} }
static void static void
AdjustFrame(int scrnIndex, int x, int y, int flags) AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; SCRN_INFO_PTR(arg);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config->output[config->compat_output]; xf86OutputPtr output = config->output[config->compat_output];
xf86CrtcPtr crtc = output->crtc; xf86CrtcPtr crtc = output->crtc;
@ -785,15 +783,16 @@ AdjustFrame(int scrnIndex, int x, int y, int flags)
} }
static void static void
FreeScreen(int scrnIndex, int flags) FreeScreen(FREE_SCREEN_ARGS_DECL)
{ {
FreeRec(xf86Screens[scrnIndex]); SCRN_INFO_PTR(arg);
FreeRec(pScrn);
} }
static void static void
LeaveVT(int scrnIndex, int flags) LeaveVT(VT_FUNC_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
xf86_hide_cursors(pScrn); xf86_hide_cursors(pScrn);
@ -806,9 +805,9 @@ LeaveVT(int scrnIndex, int flags)
* This gets called when gaining control of the VT, and from ScreenInit(). * This gets called when gaining control of the VT, and from ScreenInit().
*/ */
static Bool static Bool
EnterVT(int scrnIndex, int flags) EnterVT(VT_FUNC_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
pScrn->vtSema = TRUE; pScrn->vtSema = TRUE;
@ -825,17 +824,17 @@ EnterVT(int scrnIndex, int flags)
} }
static Bool static Bool
SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) SwitchMode(SWITCH_MODE_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; SCRN_INFO_PTR(arg);
return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
} }
static Bool static Bool
CloseScreen(int scrnIndex, ScreenPtr pScreen) CloseScreen(CLOSE_SCREEN_ARGS_DECL)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
if (ms->damage) { if (ms->damage) {
@ -854,7 +853,7 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
drmmode_free_bos(pScrn, &ms->drmmode); drmmode_free_bos(pScrn, &ms->drmmode);
if (pScrn->vtSema) { if (pScrn->vtSema) {
LeaveVT(scrnIndex, 0); LeaveVT(VT_FUNC_ARGS);
} }
pScreen->CreateScreenResources = ms->createScreenResources; pScreen->CreateScreenResources = ms->createScreenResources;
@ -862,11 +861,11 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
pScrn->vtSema = FALSE; pScrn->vtSema = FALSE;
pScreen->CloseScreen = ms->CloseScreen; pScreen->CloseScreen = ms->CloseScreen;
return (*pScreen->CloseScreen) (scrnIndex, pScreen); return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
} }
static ModeStatus static ModeStatus
ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
{ {
return MODE_OK; return MODE_OK;
} }