Attachment 846814 Details for Bug 928916 – Proposed patch

[patch] Proposed patch

mga-1.6.1-pitch.patch (text/plain), 3.41 KB, created by Matrox on 2014-01-07 18:38:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matrox

Created: 2014-01-07 18:38:23 UTC

Size: 3.41 KB

patch

obsolete

>--- xf86-video-mga-1.6.1-2/src/mga_g_crtc.c	2013-11-12 04:51:21.477220942 -0500
>+++ xf86-video-mga-1.6.1-2/src/mga_g_crtc.c.pitch	2013-11-29 09:43:17.888413834 -0500
>@@ -695,10 +695,13 @@ state_set(xf86CrtcPtr crtc, MgaCrtcState
>     if ((ht & 0x07) == 0x06 || (ht & 0x07) == 0x04)
>         ht++;
> 
>+    /* 
>+     * Compute the bytes stride. 
>+     */
>     if (crtc->scrn->bitsPerPixel == 24)
>-        wd = (mode->CrtcHDisplay * 3) >> (4 - BppShift);
>+        wd = (pMga->CurrentLayout.displayWidth * 3) >> (4 - BppShift);
>     else
>-	wd = mode->CrtcHDisplay >> (4 - BppShift);
>+	wd = pMga->CurrentLayout.displayWidth >> (4 - BppShift);
> 
>     state->ExtVga[0] = 0;
>     state->ExtVga[5] = 0;
>
>--- xf86-video-mga-1.6.1-2/src/mga_driver.c	2013-11-12 04:51:21.438220945 -0500
>+++ xf86-video-mga-1.6.1-2/src/mga_driver.c.pitch	2013-11-29 09:37:36.364415003 -0500
>@@ -1381,9 +1381,16 @@ setup_outputs(ScrnInfoPtr scrn)
> static Bool
> crtc_config_resize(ScrnInfoPtr pScrn, int width, int height)
> {
>+    MGAPtr pMga;
>+    pMga = MGAPTR(pScrn);
>     pScrn->virtualX = width;
>     pScrn->virtualY = height;
> 
>+    /*
>+     * Compute the pitch of the screen.
>+     */
>+    pMga->CurrentLayout.displayWidth = pScrn->displayWidth = ((pScrn->virtualX+15) & 0xFFFFFFF0); 
>+
>     return TRUE;
> }
> 
>@@ -2391,6 +2398,10 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
> 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "RANDR init failure\n");
> 	    return FALSE;
> 	}
>+        /*
>+         * Compute the pitch of the screen.
>+         */
>+        pScrn->displayWidth = ((pScrn->virtualX+15) & 0xFFFFFFF0); 
>     }
> 
>     /* If the Device section explicitly set HasSDRAM, don't bother checking.
>@@ -3246,7 +3257,8 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL)
>      */
> 
>     if (pMga->randr12) {
>-	width = displayWidth = pScrn->displayWidth = pScrn->virtualX;
>+	width = pScrn->virtualX;
>+	displayWidth = pScrn->displayWidth;
>     } else {
> 	width = pScrn->virtualX;
> 	displayWidth = pScrn->displayWidth;
>@@ -3266,7 +3278,11 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL)
>             pMga->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
> 
> 	displayWidth = pMga->ShadowPitch / (pScrn->bitsPerPixel >> 3);
>-        FBStart = pMga->ShadowPtr = malloc(pMga->ShadowPitch * height);
>+        /*
>+         * Since we don't resize the shadowfb at mode change, we 
>+         * allocate our buffer the size of the available memory.
>+         */
>+        FBStart = pMga->ShadowPtr = malloc(pMga->ShadowPitch * 1200);
>     } else {
> 	pMga->ShadowPtr = NULL;
> 	FBStart = pMga->FbStart;
>
>--- xf86-video-mga-1.6.1/src/mga_shadow.c	2013-11-12 04:51:21.403220945 -0500
>+++ xf86-video-mga-1.6.1/src/mga_shadow.c.pitch	2013-11-12 04:56:45.580220578 -0500
>@@ -23,17 +23,14 @@ MGARefreshArea(ScrnInfoPtr pScrn, int nu
>     unsigned char *src, *dst;
>    
>     Bpp = pScrn->bitsPerPixel >> 3;
>-    if (pMga->randr12)
>-	FBPitch = BitmapBytePad(pScrn->virtualX * pScrn->bitsPerPixel);
>-    else
>-	FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
>+    FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
> 
>     while(num--) {
> 	/* clip the box to the screen */
> 	pbox->x1 = max(pbox->x1, 0);
> 	pbox->y1 = max(pbox->y1, 0);
>-	pbox->x2 = min(pbox->x2, pScrn->pScreen->width - 1);
>-	pbox->y2 = min(pbox->y2, pScrn->pScreen->height - 1);
>+	pbox->x2 = min(pbox->x2, pScrn->pScreen->width);
>+	pbox->y2 = min(pbox->y2, pScrn->pScreen->height);
> 
> 	width = (pbox->x2 - pbox->x1) * Bpp;
> 	height = pbox->y2 - pbox->y1;
>

Actions: View | Diff

Attachments on bug 928916: 822586 | 846814