diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-02-16 13:59:28 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-08-08 08:58:03 +1000 |
| commit | 38a2af8e735dd0a09e55e8f9ad389371d63fc96b (patch) | |
| tree | 9cf8790a7f9ade0d943366116068c5c883dc378e | |
| parent | 717eb110e4fc252ba91dd0c4c70afc425207de16 (diff) | |
Remove yet another dead code path from HALectomy
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/mga.h | 2 | ||||
| -rw-r--r-- | src/mga_driver.c | 9 | ||||
| -rw-r--r-- | src/mga_merge.c | 10 |
3 files changed, 0 insertions, 21 deletions
@@ -700,8 +700,6 @@ void MGAAdjustFrameCrtc2(ADJUST_FRAME_ARGS_DECL); void MGADisplayPowerManagementSetCrtc2(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); -void MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y); - void MGA2064SetupFuncs(ScrnInfoPtr pScrn); void MGAGSetupFuncs(ScrnInfoPtr pScrn); diff --git a/src/mga_driver.c b/src/mga_driver.c index 9b80249..f73d04b 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -3387,15 +3387,6 @@ MGASwitchMode(SWITCH_MODE_ARGS_DECL) return MGAModeInit(pScrn, mode); } - /* Adjusts coordinates to match Panning granularity. - * does nothing if the HALlib is not loaded - */ -void -MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y) -{ -} - - /* * This function is used to initialize the Start Address - the first * displayed location in the video memory. diff --git a/src/mga_merge.c b/src/mga_merge.c index fb50d9f..58fcb92 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -778,11 +778,6 @@ MGAMergePointerMoved(SCRN_ARG_TYPE arg, int x, int y) pScr2->frameX0 = f2.x0; pScr2->frameY0 = f2.y0; - /*Adjust Granularity */ - MGAAdjustGranularity(pScrn,&pMga->M1frameX0,&pMga->M1frameY0); - MGAAdjustGranularity(pScrn,&pScr2->frameX0,&pScr2->frameY0); - MGAAdjustGranularity(pScrn,&pScrn->frameX0,&pScrn->frameY0); - pMga->M1frameX1 = pMga->M1frameX0 + MDMPTR(pScrn)->Monitor1->HDisplay -1; pMga->M1frameY1 = pMga->M1frameY0 + MDMPTR(pScrn)->Monitor1->VDisplay -1; pScr2->frameX1 = pScr2->frameX0 + MDMPTR(pScrn)->Monitor2->HDisplay -1; @@ -854,11 +849,6 @@ MGAAdjustMergeFrames(ADJUST_FRAME_ARGS_DECL) { pScrn1->frameX0 = x; pScrn1->frameY0 = y; - /* check granularity */ - MGAAdjustGranularity(pScrn1,&pMga->M1frameX0,&pMga->M1frameY0); - MGAAdjustGranularity(pScrn1,&pScrn2->frameX0,&pScrn2->frameY0); - MGAAdjustGranularity(pScrn1,&pScrn1->frameX0,&pScrn1->frameY0); - /* complete shitty redundant info */ pMga->M1frameX1 = pMga->M1frameX0 + MDMPTR(pScrn1)->Monitor1->HDisplay -1; pMga->M1frameY1 = pMga->M1frameY0 + MDMPTR(pScrn1)->Monitor1->VDisplay -1; |