diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-24 08:17:11 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-24 08:17:11 +0100 |
commit | 5ed959585f35a4eff2cd803ae222b46d164f210d (patch) | |
tree | 61739fa5034aa483782eb35db0ddc1dbdf0e2a2f /src/radeon_driver.c | |
parent | 2de17efdcb502f91fb145130c12be3cb164f03c5 (diff) |
radeon: update compat-api.h for block handler + enable/disable fb.
This updates the compat stuff for the latest block handler code,
and the enable/disable interface.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r-- | src/radeon_driver.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 611d7364..cee25d89 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3373,15 +3373,14 @@ static void RADEONLoadPalette(ScrnInfoPtr pScrn, int numColors, #endif } -static void RADEONBlockHandler(SCREEN_ARG_TYPE arg, pointer blockData, - pointer pTimeout, pointer pReadmask) +static void RADEONBlockHandler(BLOCKHANDLER_ARGS_DECL) { SCREEN_PTR(arg); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); RADEONInfoPtr info = RADEONPTR(pScrn); pScreen->BlockHandler = info->BlockHandler; - (*pScreen->BlockHandler) (arg, blockData, pTimeout, pReadmask); + (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); pScreen->BlockHandler = RADEONBlockHandler; if (info->VideoTimerCallback) @@ -3448,7 +3447,7 @@ RADEONInitBIOSRegisters(ScrnInfoPtr pScrn) /* Called at the start of each server generation. */ -Bool RADEONScreenInit(SCREEN_INIT_ARGS) +Bool RADEONScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); RADEONInfoPtr info = RADEONPTR(pScrn); |