Attachment #60265 for bug #94600

Lines 281-287 Link Here

(-)default/fbdev/ati/mach64/visual.c~ (-2 / +2 lines)
281	}*/	281	}*/
282		282
283	free(priv);	283	free(priv);
284	ATI_MACH64_PRIV(vis) = NULL;	284	LIBGGI_PRIVATE(vis) = NULL;
285		285
286	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);	286	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
287		287
Lines 313-319 Link Here
313	if (priv == NULL) {	313	if (priv == NULL) {
314	return GGI_ENOMEM;	314	return GGI_ENOMEM;
315	}	315	}
316	ATI_MACH64_PRIV(vis) = priv;	316	LIBGGI_PRIVATE(vis) = priv;
317		317
318		318
319	fbdevpriv->mmioaddr = mmap(NULL, fbdevpriv->orig_fix.mmio_len,	319	fbdevpriv->mmioaddr = mmap(NULL, fbdevpriv->orig_fix.mmio_len,

Lines 117-123 Link Here

(-)default/fbdev/mga/g400/visual.c~ (-2 / +2 lines)
117	}	117	}
118		118
119	free(priv);	119	free(priv);
120	MGA_G400_PRIV(vis) = NULL;	120	LIBGGI_PRIVATE(vis) = NULL;
121		121
122	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);	122	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
123		123
Lines 259-265 Link Here
259	/* vis->opdraw->crossblit = GGI_mga_g400_crossblit; */	259	/* vis->opdraw->crossblit = GGI_mga_g400_crossblit; */
260	}	260	}
261		261
262	MGA_G400_PRIV(vis) = priv;	262	LIBGGI_PRIVATE(vis) = priv;
263		263
264	/* Register cleanup handler */	264	/* Register cleanup handler */
265	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);	265	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);

Lines 111-117 Link Here

(-)default/fbdev/mga/2164w/visual.c~ (-2 / +2 lines)
111	}	111	}
112		112
113	free(priv);	113	free(priv);
114	M2164W_PRIV(vis) = NULL;	114	LIBGGI_PRIVATE(vis) = NULL;
115		115
116	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);	116	ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
117		117
Lines 253-259 Link Here
253	vis->opdraw->crossblit = GGI_m2164w_crossblit;	253	vis->opdraw->crossblit = GGI_m2164w_crossblit;
254	}	254	}
255		255
256	M2164W_PRIV(vis) = priv;	256	LIBGGI_PRIVATE(vis) = priv;
257		257
258	/* Register cleanup handler */	258	/* Register cleanup handler */
259	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);	259	ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);

Lines 124-130 Link Here

(-)display/vcsa/visual.c~ (-1 / +1 lines)
124	}	124	}
125	}	125	}
126		126
127	priv = VCSA_PRIV(vis) = malloc(sizeof(ggi_vcsa_priv));	127	priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_vcsa_priv));
128	if (priv == NULL) return GGI_ENOMEM;	128	if (priv == NULL) return GGI_ENOMEM;
129		129
130	LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));	130	LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));

Lines 163-169 Link Here

(-)display/xf86dga/visual.c~ (-2 / +2 lines)
163	free(DGA_PRIV(vis));	163	free(DGA_PRIV(vis));
164	free(LIBGGI_GC(vis));	164	free(LIBGGI_GC(vis));
165		165
166	DGA_PRIV(vis) = NULL;	166	LIBGGI_PRIVATE(vis) = NULL;
167		167
168	ggUnregisterCleanup((ggcleanup_func *) do_cleanup, vis);	168	ggUnregisterCleanup((ggcleanup_func *) do_cleanup, vis);
169		169
Lines 276-282 Link Here
276	GGIDPRINT_MISC("Virtwidth: %d, depth: %d, size: %d\n",	276	GGIDPRINT_MISC("Virtwidth: %d, depth: %d, size: %d\n",
277	priv->width, priv->depth, priv->size);	277	priv->width, priv->depth, priv->size);
278		278
279	DGA_PRIV(vis) = priv;	279	LIBGGI_PRIVATE(vis) = priv;
280		280
281	/* Register cleanup handler */	281	/* Register cleanup handler */
282	ggRegisterCleanup((ggcleanup_func *) do_cleanup, vis);	282	ggRegisterCleanup((ggcleanup_func *) do_cleanup, vis);

Return to bug 94600