x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch

72 +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
84 +#define CLOSE_SCREEN_DECL_ScrnInfoPtr ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
96 +#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
98 +#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn->scrnIndex, b
103 +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
115 +#define CLOSE_SCREEN_DECL_ScrnInfoPtr ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
117 +#define FBDEVHWADJUSTFRAME_ARGS(x, y) pScrn, (x), (y)
126 +#define VT_FUNC_ARGS(flags) pScrn
128 +#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn, b
148 @@ -1373,19 +1375,19 @@ imxDisplayPreInit(ScrnInfoPtr pScrn)
152 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
153 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
154  	ImxPtr fPtr = IMXPTR(pScrn);
156  	if (!xf86SetDesiredModes(pScrn)) {
159 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n");
164  	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) {
167 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n");
170  	pScrn->displayWidth =
178 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
181  	return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
189 +//	fbdevHWAdjustFrame(pScrn->scrnIndex, x, y, flags);
196 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
199  	return xf86SetDesiredModes(pScrn);
253 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
256  	imxFreeRec(pScrn);
263 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
265  	ImxPtr fPtr = IMXPTR(pScrn);
267  	fbdevHWRestore(pScrn);
269  	pScrn->vtSema = FALSE;
284 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
285 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
286  	ImxPtr fPtr = IMXPTR(pScrn);
291  	fPtr->fbMemoryBase = fbdevHWMapVidmem(pScrn);
294 +	        xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory"
303 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
312 +		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
318 +	if (!imxDisplayStartScreenInit(pScrn->scrnIndex, pScreen)) {
324  	if (pScrn->bitsPerPixel > 8) {
325  		if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
327 +			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
329  				   pScrn->bitsPerPixel);
332  		if (!miSetVisualTypes(pScrn->depth,
333  				      miGetDefaultVisualMask(pScrn->depth),
334  				      pScrn->rgbBits, pScrn->defaultVisual)) {
336 +			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
338  				   pScrn->bitsPerPixel);
344 +	  xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n");
350  	pScrn->displayWidth = fbdevHWGetLineLength(pScrn) /
351  			      (pScrn->bitsPerPixel / 8);
352 -	xf86DrvMsg(scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth);
353 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth);
355  	if (pScrn->displayWidth != pScrn->virtualX) {
357 +		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
359  			   pScrn->displayWidth);
366 +			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
369  				   " imxScreenInit()\n", pScrn->bitsPerPixel);
375 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
384 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
392 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
399 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
408 +		if (!imxExaZ160Setup(pScrn->scrnIndex, pScreen)) {
417 +			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
425 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
431 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
437 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
443 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
452 +	if (!imxDisplayFinishScreenInit(pScrn->scrnIndex, pScreen)) {
460 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
461 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
464  	if (0 != strcmp(IMX_DRIVER_NAME, pScrn->driverName)) {
473 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
474 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
475      ImxPtr imxPtr = IMXPTR(pScrn);
482 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
483 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
484      ImxPtr imxPtr = IMXPTR(pScrn);
491 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
492 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
493      ImxPtr imxPtr = IMXPTR(pScrn);
500 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
501 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
502      ImxPtr imxPtr = IMXPTR(pScrn);
509 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
510 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
511      ImxPtr imxPtr = IMXPTR(pScrn);
518 -    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
519 +    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
520      ImxPtr imxPtr = IMXPTR(pScrn);
539 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
540 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
543  	ImxPtr imxPtr = IMXPTR(pScrn);
548 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
549 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
557 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
558 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
561  	ImxPtr imxPtr = IMXPTR(pScrn);
566 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
567 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
568  	ImxPtr imxPtr = IMXPTR(pScrn);
575 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
576 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
577  	ImxPtr imxPtr = IMXPTR(pScrn);
584 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
585 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
588  	ImxPtr imxPtr = IMXPTR(pScrn);
593 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
594 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
597  	ImxPtr imxPtr = IMXPTR(pScrn);
602 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
603 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
606  	ImxPtr imxPtr = IMXPTR(pScrn);
611 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
612 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
615  	ImxPtr imxPtr = IMXPTR(pScrn);
620 -	ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
621 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
624  	ImxPtr imxPtr = IMXPTR(pScrn);
629 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
630 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
633  	ImxPtr imxPtr = IMXPTR(pScrn);
638 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
639 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
642  	ImxPtr imxPtr = IMXPTR(pScrn);
647 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
648 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
651  	ImxPtr imxPtr = IMXPTR(pScrn);
656 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
657 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
660  	if (pScrn->numEntities != 1) {
665 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
666 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
674 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
675 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
678  	ImxPtr imxPtr = IMXPTR(pScrn);
683 -	ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum];
684 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen);
687  	ImxPtr imxPtr = IMXPTR(pScrn);
692 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
693 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
696  	ImxPtr imxPtr = IMXPTR(pScrn);
701 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
702 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
705  	ImxPtr imxPtr = IMXPTR(pScrn);
713 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
715  	ImxPtr imxPtr = IMXPTR(pScrn);
731 -	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
732 +	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
733  	ImxPtr imxPtr = IMXPTR(pScrn);
738  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
747  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
757  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "EXA initialization failed.\n");