Attachment 208776 Details for Bug 241650 – patch

[patch] patch

xf86-video-scfb.patch (text/plain), 5.70 KB, created by Ivan Rozhuk on 2019-11-01 21:44:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2019-11-01 21:44:58 UTC

Size: 5.70 KB

patch

obsolete

>Index: x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c
>===================================================================
>--- x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c	(revision 516213)
>+++ x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c	(working copy)
>@@ -17,7 +17,7 @@
>  #undef	DEBUG
>  #define	DEBUG	1
>  
>-@@ -101,15 +102,15 @@ static const OptionInfoRec * ScfbAvailab
>+@@ -101,15 +102,15 @@ static const OptionInfoRec * ScfbAvailableOptions(int,
>  static void ScfbIdentify(int);
>  static Bool ScfbProbe(DriverPtr, int);
>  static Bool ScfbPreInit(ScrnInfoPtr, int);
>@@ -40,7 +40,26 @@
>  static void ScfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
>  static Bool ScfbSaveScreen(ScreenPtr, int);
>  static void ScfbSave(ScrnInfoPtr);
>-@@ -231,7 +232,7 @@ typedef struct {
>+@@ -195,18 +196,7 @@ static pointer
>+ ScfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
>+ {
>+ 	static Bool setupDone = FALSE;
>+-	const char *osname;
>+ 
>+-	/* Check that we're being loaded on a OpenBSD or NetBSD system. */
>+-	LoaderGetOS(&osname, NULL, NULL, NULL);
>+-	if (!osname || (strcmp(osname, "freebsd") != 0 && strcmp(osname, "openbsd") != 0 &&
>+-	                strcmp(osname, "netbsd") != 0)) {
>+-		if (errmaj)
>+-			*errmaj = LDR_BADOS;
>+-		if (errmin)
>+-			*errmin = 0;
>+-		return NULL;
>+-	}
>+ 	if (!setupDone) {
>+ 		setupDone = TRUE;
>+ 		xf86AddDriver(&SCFB, module, HaveDriverFuncs);
>+@@ -231,7 +221,7 @@ typedef struct {
>  	void *			shadow;
>  	CloseScreenProcPtr	CloseScreen;
>  	CreateScreenResourcesProcPtr CreateScreenResources;
>@@ -49,7 +68,7 @@
>  	EntityInfoPtr		pEnt;
>  
>  #ifdef XFreeXDGA
>-@@ -302,7 +303,7 @@ scfb_mmap(size_t len, off_t off, int fd)
>+@@ -302,7 +292,7 @@ scfb_mmap(size_t len, off_t off, int fd)
>  		mapaddr = NULL;
>  	}
>  #if DEBUG
>@@ -58,7 +77,7 @@
>  #endif
>  	return mapaddr;
>  }
>-@@ -314,6 +315,7 @@ ScfbProbe(DriverPtr drv, int flags)
>+@@ -314,6 +304,7 @@ ScfbProbe(DriverPtr drv, int flags)
>         	GDevPtr *devSections;
>  	int numDevSections;
>  	const char *dev;
>@@ -66,7 +85,7 @@
>  	Bool foundScreen = FALSE;
>  
>  	TRACE("probe start");
>-@@ -330,7 +332,8 @@ ScfbProbe(DriverPtr drv, int flags)
>+@@ -330,7 +321,8 @@ ScfbProbe(DriverPtr drv, int flags)
>  	for (i = 0; i < numDevSections; i++) {
>  		ScrnInfoPtr pScrn = NULL;
>  		dev = xf86FindOptionValue(devSections[i]->options, "device");
>@@ -76,7 +95,7 @@
>  			entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
>  			pScrn = xf86ConfigFbEntity(NULL,0,entity,
>  						   NULL,NULL,NULL,NULL);
>-@@ -366,8 +369,8 @@ ScfbPreInit(ScrnInfoPtr pScrn, int flags
>+@@ -366,8 +358,8 @@ ScfbPreInit(ScrnInfoPtr pScrn, int flags)
>  	struct fbtype fb;
>  	int default_depth, wstype;
>  	const char *dev;
>@@ -87,7 +106,7 @@
>  	Gamma zeros = {0.0, 0.0, 0.0};
>  	DisplayModePtr mode;
>  
>-@@ -633,9 +636,9 @@ ScfbShadowInit(ScreenPtr pScreen)
>+@@ -633,9 +625,9 @@ ScfbShadowInit(ScreenPtr pScreen)
>  }
>  
>  static Bool
>@@ -99,7 +118,7 @@
>  	ScfbPtr fPtr = SCFBPTR(pScrn);
>  	VisualPtr visual;
>  	int ret, flags, ncolors;
>-@@ -792,7 +795,7 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
>+@@ -792,7 +784,7 @@ ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int a
>  				   "RENDER extension initialisation failed.");
>  	}
>  	if (fPtr->shadowFB && !ScfbShadowInit(pScreen)) {
>@@ -108,7 +127,7 @@
>  		    "shadow framebuffer initialization failed\n");
>  		return FALSE;
>  	}
>-@@ -801,20 +804,19 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
>+@@ -801,20 +793,19 @@ ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int a
>  	if (!fPtr->rotate)
>  		ScfbDGAInit(pScrn, pScreen);
>  	else
>@@ -132,7 +151,7 @@
>  	xf86SetBackingStore(pScreen);
>  
>  	/* Software cursor. */
>-@@ -858,9 +860,9 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
>+@@ -858,9 +849,9 @@ ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int a
>  }
>  
>  static Bool
>@@ -144,7 +163,7 @@
>  	PixmapPtr pPixmap;
>  	ScfbPtr fPtr = SCFBPTR(pScrn);
>  
>-@@ -892,7 +894,7 @@ ScfbCloseScreen(int scrnIndex, ScreenPtr
>+@@ -892,7 +883,7 @@ ScfbCloseScreen(int scrnIndex, ScreenPtr pScreen)
>  	/* Unwrap CloseScreen. */
>  	pScreen->CloseScreen = fPtr->CloseScreen;
>  	TRACE_EXIT("ScfbCloseScreen");
>@@ -153,7 +172,7 @@
>  }
>  
>  static void *
>-@@ -907,9 +909,9 @@ ScfbWindowLinear(ScreenPtr pScreen, CARD
>+@@ -907,9 +898,9 @@ ScfbWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32
>  }
>  
>  static void
>@@ -165,7 +184,7 @@
>      ScfbPtr fPtr = SCFBPTR(pScrn);
>      int newX, newY;
>  
>-@@ -941,13 +943,13 @@ ScfbPointerMoved(int index, int x, int y
>+@@ -941,13 +932,13 @@ ScfbPointerMoved(int index, int x, int y)
>      }
>  
>      /* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
>@@ -182,7 +201,7 @@
>  
>  	TRACE_ENTER("EnterVT");
>  	pScrn->vtSema = TRUE;
>-@@ -956,20 +958,20 @@ ScfbEnterVT(int scrnIndex, int flags)
>+@@ -956,20 +947,20 @@ ScfbEnterVT(int scrnIndex, int flags)
>  }
>  
>  static void
>@@ -207,7 +226,7 @@
>  #endif
>  
>  	TRACE_ENTER("SwitchMode");
>-@@ -978,10 +980,10 @@ ScfbSwitchMode(int scrnIndex, DisplayMod
>+@@ -978,10 +969,10 @@ ScfbSwitchMode(int scrnIndex, DisplayModePtr mode, int
>  }
>  
>  static int
>@@ -220,7 +239,7 @@
>  #endif
>  
>  	TRACE_ENTER("ValidMode");
>-@@ -1067,7 +1069,6 @@ static Bool
>+@@ -1067,7 +1058,6 @@ static Bool
>  ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
>  {
>  	DisplayModePtr pMode;
>@@ -228,7 +247,7 @@
>  	int frameX0, frameY0;
>  
>  	if (pDGAMode) {
>-@@ -1081,9 +1082,9 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
>+@@ -1081,9 +1071,9 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
>  		frameY0 = pScrn->frameY0;
>  	}
>  
>@@ -240,7 +259,7 @@
>  
>  	return TRUE;
>  }
>-@@ -1091,7 +1092,7 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
>+@@ -1091,7 +1081,7 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
>  static void
>  ScfbDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
>  {

Actions: View | Diff

Attachments on bug 241650: 208776 | 208811