summaryrefslogtreecommitdiff
path: root/src/nv_video.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-07 15:52:16 +0100
committerDave Airlie <airlied@redhat.com>2012-06-07 15:52:16 +0100
commit713e9501b87465cf2a62c27605b6fc4a454dad95 (patch)
tree0be6ee6ba5f01ad4f16c4c798a69992b36047186 /src/nv_video.c
parentb3d61828837661c9b383378a7d6006752659108b (diff)
nv: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/nv_video.c')
-rw-r--r--src/nv_video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nv_video.c b/src/nv_video.c
index ad267bf..52d651b 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -239,7 +239,7 @@ NVAllocateOverlayMemory(
xf86FreeOffscreenLinear(linear);
}
- pScreen = screenInfo.screens[pScrn->scrnIndex];
+ pScreen = xf86ScrnToScreen(pScrn);
new_linear = xf86AllocateOffscreenLinear(pScreen, size, 32,
NULL, NULL, NULL);
@@ -287,7 +287,7 @@ static void NVFreeBlitMemory(ScrnInfoPtr pScrnInfo)
void NVInitVideo (ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL;
XF86VideoAdaptorPtr blitAdaptor = NULL;
@@ -343,7 +343,7 @@ void NVInitVideo (ScreenPtr pScreen)
static XF86VideoAdaptorPtr
NVSetupBlitVideo (ScreenPtr pScreen)
{
- ScrnInfoPtr pScrnInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrnInfo = xf86ScreenToScrn(pScreen);
NVPtr pNv = NVPTR(pScrnInfo);
XF86VideoAdaptorPtr adapt;
NVPortPrivPtr pPriv;
@@ -406,7 +406,7 @@ NVSetupBlitVideo (ScreenPtr pScreen)
static XF86VideoAdaptorPtr
NVSetupOverlayVideo (ScreenPtr pScreen)
{
- ScrnInfoPtr pScrnInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrnInfo = xf86ScreenToScrn(pScreen);
NVPtr pNv = NVPTR(pScrnInfo);
XF86VideoAdaptorPtr adapt;
NVPortPrivPtr pPriv;