diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/savage')
3 files changed, 11 insertions, 11 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c index 9c7b59f31..de3b07317 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c @@ -324,7 +324,7 @@ static Bool SAVAGEInitVisualConfigs( ScreenPtr pScreen ) } static Bool SAVAGECreateContext( ScreenPtr pScreen, VisualPtr visual, - drmContext hwContext, void *pVisualConfigPriv, + drm_context_t hwContext, void *pVisualConfigPriv, DRIContextType contextStore ) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -390,7 +390,7 @@ static Bool SAVAGECreateContext( ScreenPtr pScreen, VisualPtr visual, } -static void SAVAGEDestroyContext( ScreenPtr pScreen, drmContext hwContext, +static void SAVAGEDestroyContext( ScreenPtr pScreen, drm_context_t hwContext, DRIContextType contextStore ) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -823,7 +823,7 @@ static Bool SAVAGEDRIMapInit( ScreenPtr pScreen ) pSAVAGEDRIServer->registers.size = SAVAGEIOMAPSIZE; if ( drmAddMap( psav->drmFD, - (drmHandle)psav->MmioBase, + (drm_handle_t)psav->MmioBase, pSAVAGEDRIServer->registers.size, DRM_REGISTERS,0, &pSAVAGEDRIServer->registers.handle ) < 0 ) { @@ -835,7 +835,7 @@ static Bool SAVAGEDRIMapInit( ScreenPtr pScreen ) pSAVAGEDRIServer->aperture.size = 5 * 0x01000000; if ( drmAddMap( psav->drmFD, - (drmHandle)(psav->ApertureBase), + (drm_handle_t)(psav->ApertureBase), pSAVAGEDRIServer->aperture.size, DRM_FRAME_BUFFER,0, &pSAVAGEDRIServer->aperture.handle ) < 0 ) { diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.h index 2d319ba1c..af62e761c 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.h @@ -40,7 +40,7 @@ #define SAVAGE_BUFFER_ALIGN 0x00000fff typedef struct{ - drmContext ctxOwner; + drm_context_t ctxOwner; unsigned long agp_offset; unsigned long agp_handle; unsigned long map_handle; @@ -116,20 +116,20 @@ typedef struct { int agpMode; - drmHandle frontbuffer; + drm_handle_t frontbuffer; unsigned int frontbufferSize; unsigned int frontOffset; unsigned int frontPitch; unsigned int frontBitmapDesc; /*Bitmap Descriptior*/ unsigned int IsfrontTiled; - drmHandle backbuffer; + drm_handle_t backbuffer; unsigned int backbufferSize; unsigned int backOffset; unsigned int backPitch; unsigned int backBitmapDesc; /*Bitmap Descriptior*/ - drmHandle depthbuffer; + drm_handle_t depthbuffer; unsigned int depthbufferSize; unsigned int depthOffset; unsigned int depthPitch; @@ -137,8 +137,8 @@ typedef struct { - drmHandle textures; - drmHandle xvmcSurfHandle; + drm_handle_t textures; + drm_handle_t xvmcSurfHandle; unsigned int textureOffset; unsigned int textureSize; int logTextureGranularity; diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_hwmc.c b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_hwmc.c index d4ce79d82..37d314d97 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_hwmc.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_hwmc.c @@ -64,7 +64,7 @@ void SAVAGEXvMCDestroySubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSurf); typedef struct { - drmContext drmcontext; + drm_context_t drmcontext; unsigned int fbBase; unsigned int MMIOHandle; unsigned int MMIOSize; |