Lines Matching +full:current +full:- +full:rotate
3 Date: Wed, 21 May 2014 09:49:56 -0400
8 Signed-off-by: Adam Jackson <ajax@redhat.com>
9 [Upstream https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev/-/commit/2673e727063fe2831083…
10 ported to xf86-video-fbturbo]
11 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
12 ---
13 src/fbdev.c | 86 +++++++++++++++++++++++++++++++++++++++++++----------
14 1 file changed, 71 insertions(+), 15 deletions(-)
16 diff --git a/src/fbdev.c b/src/fbdev.c
18 --- a/src/fbdev.c
20 @@ -269,6 +269,35 @@ FBDevIdentify(int flags)
56 @@ -294,11 +323,11 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
57 pScrn->Probe = FBDevProbe;
58 pScrn->PreInit = FBDevPreInit;
59 pScrn->ScreenInit = FBDevScreenInit;
60 - pScrn->SwitchMode = fbdevHWSwitchModeWeak();
61 - pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
62 - pScrn->EnterVT = fbdevHWEnterVTWeak();
63 - pScrn->LeaveVT = fbdevHWLeaveVTWeak();
64 - pScrn->ValidMode = fbdevHWValidModeWeak();
65 + pScrn->SwitchMode = fbdevSwitchMode;
66 + pScrn->AdjustFrame = fbdevAdjustFrame;
67 + pScrn->EnterVT = fbdevEnterVT;
68 + pScrn->LeaveVT = fbdevLeaveVT;
69 + pScrn->ValidMode = fbdevValidMode;
71 xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
73 @@ -411,11 +440,11 @@ FBDevProbe(DriverPtr drv, int flags)
74 pScrn->Probe = FBDevProbe;
75 pScrn->PreInit = FBDevPreInit;
76 pScrn->ScreenInit = FBDevScreenInit;
77 - pScrn->SwitchMode = fbdevHWSwitchModeWeak();
78 - pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
79 - pScrn->EnterVT = fbdevHWEnterVTWeak();
80 - pScrn->LeaveVT = fbdevHWLeaveVTWeak();
81 - pScrn->ValidMode = fbdevHWValidModeWeak();
82 + pScrn->SwitchMode = fbdevSwitchMode;
83 + pScrn->AdjustFrame = fbdevAdjustFrame;
84 + pScrn->EnterVT = fbdevEnterVT;
85 + pScrn->LeaveVT = fbdevLeaveVT;
86 + pScrn->ValidMode = fbdevValidMode;
88 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
90 @@ -656,6 +685,17 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
108 @@ -675,7 +715,7 @@ FBDevCreateScreenResources(ScreenPtr pScreen)
109 pPixmap = pScreen->GetScreenPixmap(pScreen);
111 if (!shadowAdd(pScreen, pPixmap, fPtr->rotate ?
112 - shadowUpdateRotatePackedWeak() : shadowUpdatePackedWeak(),
114 FBDevWindowLinear, fPtr->rotate, NULL)) {
117 @@ -699,6 +739,23 @@ FBDevShadowInit(ScreenPtr pScreen)
141 @@ -1025,13 +1082,12 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
145 - if(!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(),
146 - NULL, flags))
150 - xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0);
153 - pScreen->SaveScreen = fbdevHWSaveScreenWeak();
154 + pScreen->SaveScreen = fbdevSaveScreen;
156 /* Wrap the current CloseScreen function */
157 fPtr->CloseScreen = pScreen->CloseScreen;
158 --