summaryrefslogtreecommitdiff
path: root/src/savage_video.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-06 11:22:29 +0100
committerDave Airlie <airlied@redhat.com>2012-06-06 11:22:29 +0100
commita2714fb09e1e0badbb3e98e24d4b1ed92003bdb9 (patch)
tree80a4688783ad46e33fc90e8c014f6a32f41e8c42 /src/savage_video.c
parentde22eab9a21df80fe965dc37d21ba3ac2b9f5fd0 (diff)
savage: port to new compat API
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/savage_video.c')
-rw-r--r--src/savage_video.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/savage_video.c b/src/savage_video.c
index b5a6330..63958b7 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -338,7 +338,7 @@ SavageClipVWindow(ScrnInfoPtr pScrn)
void SavageInitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
SavagePtr psav = SAVPTR(pScrn);
@@ -877,7 +877,7 @@ void SavageResetVideo(ScrnInfoPtr pScrn)
static XF86VideoAdaptorPtr
SavageSetupImageVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SavagePtr psav = SAVPTR(pScrn);
XF86VideoAdaptorPtr adapt;
SavagePortPrivPtr pPriv;
@@ -1324,7 +1324,7 @@ SavageCopyPlanarData(
static void
SavageVideoSave(ScreenPtr pScreen, ExaOffscreenArea *area)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SavagePtr psav = SAVPTR(pScrn);
SavagePortPrivPtr pPriv = psav->adaptor->pPortPrivates[0].ptr;
@@ -1340,7 +1340,7 @@ SavageAllocateMemory(
void **mem_struct,
int size
){
- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
SavagePtr psav = SAVPTR(pScrn);
int offset = 0;
@@ -2359,7 +2359,7 @@ static void
SavageInitOffscreenImages(ScreenPtr pScreen)
{
XF86OffscreenImagePtr offscreenImages;
- SavagePtr psav = SAVPTR(xf86Screens[pScreen->myNum]);
+ SavagePtr psav = SAVPTR(xf86ScreenToScrn(pScreen));
/* need to free this someplace */
if (!psav->offscreenImages) {