Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 228473 | Differences between
and this patch

Collapse All | Expand All

(-)xf86-video-openchrome-0.2.903/libxvmc/viaLowLevel.c (-3 / +10 lines)
Lines 277-286 viaDMAInitTimeStamp(XvMCLowLevel * xl) Link Here
277
	xl->tsMem.size = 64;
277
	xl->tsMem.size = 64;
278
	xl->tsMem.type = VIA_MEM_VIDEO;
278
	xl->tsMem.type = VIA_MEM_VIDEO;
279
	if (drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, &xl->tsMem,
279
	if (drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, &xl->tsMem,
280
		sizeof(xl->tsMem)) < 0)
280
		sizeof(xl->tsMem)) < 0) {
281
	    fprintf(stderr, "DRM_VIA_ALLOCMEM failed size %d\n", sizeof(xl->tsMem));
281
	    return ret;
282
	    return ret;
282
	if (xl->tsMem.size != 64)
283
	}
284
	if (xl->tsMem.size != 64) {
285
	    fprintf(stderr, "error: tsMem.size is %d\n", tsMem.size);
283
	    return -1;
286
	    return -1;
287
	}
284
	xl->tsOffset = (xl->tsMem.offset + 31) & ~31;
288
	xl->tsOffset = (xl->tsMem.offset + 31) & ~31;
285
	xl->tsP = (CARD32 *) xl->fbAddress + (xl->tsOffset >> 2);
289
	xl->tsP = (CARD32 *) xl->fbAddress + (xl->tsOffset >> 2);
286
	xl->curTimeStamp = 1;
290
	xl->curTimeStamp = 1;
Lines 1014-1021 initXvMCLowLevel(int fd, drm_context_t * Link Here
1014
1018
1015
    xl = (XvMCLowLevel *) malloc(sizeof(XvMCLowLevel));
1019
    xl = (XvMCLowLevel *) malloc(sizeof(XvMCLowLevel));
1016
1020
1017
    if (!xl)
1021
    if (!xl) {
1022
	fprintf(stderr, "malloc failed\n");
1018
	return NULL;
1023
	return NULL;
1024
    }
1019
1025
1020
    xl->agp_pos = 0;
1026
    xl->agp_pos = 0;
1021
    xl->pci_pos = 0;
1027
    xl->pci_pos = 0;
Lines 1031-1036 initXvMCLowLevel(int fd, drm_context_t * Link Here
1031
    xl->agpSync = 0;
1037
    xl->agpSync = 0;
1032
    ret = viaDMAInitTimeStamp(xl);
1038
    ret = viaDMAInitTimeStamp(xl);
1033
    if (ret) {
1039
    if (ret) {
1040
	fprintf(stderr, "viaDMAInitTimeStamp failed with code %d\n", ret);
1034
	free(xl);
1041
	free(xl);
1035
	return NULL;
1042
	return NULL;
1036
    }
1043
    }

Return to bug 228473