On Wed, Oct 1, 2014 at 5:22 AM, Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx> wrote: > Hey, > > Op 01-10-14 om 11:04 schreef Christian König: >> Am 01.10.2014 um 10:57 schrieb Maarten Lankhorst: >>> Op 25-09-14 om 12:39 schreef Maarten Lankhorst: >>>> Not the whole world is a radeon! :-) >>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx> >>>> --- >>>> Changes: >>>> - Removed interruptible parameter, only 1 place has a use for it, >>>> and it's the only place that can hit it. >>>> - Fail faster in radeon_semaphore_sync_resv. >>>> - Make the break on error in radeon_cs.c more explicit. >>>> - Upgrade the unlikely() to a WARN_ON_ONCE() in radeon_fence_wait, with a comment explaining why. >>> Ping, can you review? >> >> LGTM, patch is Reviewed-by: Christian König <christian.koenig@xxxxxxx> >> >> But we might want to pull it in through Alex drm-next-3.18 (or -3.19) branch to avoid merge conflicts. > I can push nouveau through my own tree and once the patches are merged get the radeon changes through agd5f's tree? Either way works for me. Are we trying to get this in for 3.18 or 3.19? Alex _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel