Attachment #248327 for bug #338330




    return &dFence->mf;
}

/*
static void
fenceDestroy(struct _MMFence *mf)
{

    assert(ret == 0);
    free(dFence);
}
*/

static int
fenceEmit(struct _MMFence *mf, unsigned fence_class,

    mm->fenceSignaled = fenceSignaled;
    mm->fenceWait = fenceWait;
    mm->fenceError = NULL;
    /* mm->fenceDestroy = fenceDestroy; */
    mm->destroy = destroy;
    return mm;





    int (*fenceWait) (struct _MMFence * mf, unsigned flushMask,
		      unsigned flags);
    unsigned (*fenceError) (struct _MMFence * mf);
    /* void (*fenceDestroy) (struct _MMFence * mf); */
} MMManager;

/*

    return mf->man->fenceEmit(mf, class, type, flags);
}

/*
static inline void
mmFenceUnReference(struct _MMFence **mfP)
{

    }
    *mfP = NULL;
}
*/

static inline struct _MMFence *
mmFenceReference(struct _MMFence *mf)

Lines 77-82 typedef struct _UserSignal Link Here

(-)xserver-xorg-video-psb-0.31.0/libmm/mm_user.c.comment_unused (+2 lines)
77	UserManager *man;	77	UserManager *man;
78	} UserSignal;	78	} UserSignal;
79		79
		80	/*
80	void	81	void
81	mmFenceSignal(struct _MMSignal *signal, unsigned class,	82	mmFenceSignal(struct _MMSignal *signal, unsigned class,
82	unsigned type, unsigned sequence, unsigned error,	83	unsigned type, unsigned sequence, unsigned error,
Lines 148-153 mmFenceSignal(struct _MMSignal *signal, Link Here
148	type \|= fence->signalPrevious;	149	type \|= fence->signalPrevious;
149	}	150	}
150	}	151	}
		152	*/
151		153
152	static int	154	static int
153	fenceEmit(struct _MMFence *mf, unsigned class, unsigned type, unsigned flags)	155	fenceEmit(struct _MMFence *mf, unsigned class, unsigned type, unsigned flags)

Return to bug 338330

Lines 277-282 createFence(struct _MMManager *mm, Link Here

(-)xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.comment_unused (-1 / +3 lines)
277	return &dFence->mf;	277	return &dFence->mf;
278	}	278	}
279		279
		280	/*
280	static void	281	static void
281	fenceDestroy(struct _MMFence *mf)	282	fenceDestroy(struct _MMFence *mf)
282	{	283	{
Lines 288-293 fenceDestroy(struct _MMFence *mf) Link Here
288	assert(ret == 0);	289	assert(ret == 0);
289	free(dFence);	290	free(dFence);
290	}	291	}
		292	*/
291		293
292	static int	294	static int
293	fenceEmit(struct _MMFence *mf, unsigned fence_class,	295	fenceEmit(struct _MMFence *mf, unsigned fence_class,
Lines 369-375 mmCreateDRM(int drmFD) Link Here
369	mm->fenceSignaled = fenceSignaled;	371	mm->fenceSignaled = fenceSignaled;
370	mm->fenceWait = fenceWait;	372	mm->fenceWait = fenceWait;
371	mm->fenceError = NULL;	373	mm->fenceError = NULL;
372	mm->fenceDestroy = fenceDestroy;	374	/* mm->fenceDestroy = fenceDestroy; */
373	mm->destroy = destroy;	375	mm->destroy = destroy;
374	return mm;	376	return mm;
375		377

Lines 141-147 typedef struct _MMManager Link Here

(-)xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h.comment_unused (-1 / +3 lines)
141	int (fenceWait) (struct _MMFence mf, unsigned flushMask,	141	int (fenceWait) (struct _MMFence mf, unsigned flushMask,
142	unsigned flags);	142	unsigned flags);
143	unsigned (fenceError) (struct _MMFence mf);	143	unsigned (fenceError) (struct _MMFence mf);
144	void (fenceDestroy) (struct _MMFence mf);	144	/* void (fenceDestroy) (struct _MMFence mf); */
145	} MMManager;	145	} MMManager;
146		146
147	/*	147	/*
Lines 204-209 mmFenceEmit(struct _MMFence *mf, unsigne Link Here
204	return mf->man->fenceEmit(mf, class, type, flags);	204	return mf->man->fenceEmit(mf, class, type, flags);
205	}	205	}
206		206
		207	/*
207	static inline void	208	static inline void
208	mmFenceUnReference(struct _MMFence **mfP)	209	mmFenceUnReference(struct _MMFence **mfP)
209	{	210	{
Lines 214-219 mmFenceUnReference(struct _MMFence **mfP Link Here
214	}	215	}
215	*mfP = NULL;	216	*mfP = NULL;
216	}	217	}
		218	*/
217		219
218	static inline struct _MMFence *	220	static inline struct _MMFence *
219	mmFenceReference(struct _MMFence *mf)	221	mmFenceReference(struct _MMFence *mf)