Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b17abc6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 'dev/msm-3.18-android_sync_revert' into msm-3.18"

parents e7daafdf 0864dee0

drivers/gpu/msm/kgsl_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ static void kgsl_sync_pt_destroy(struct sync_pt *pt) 
static struct sync_pt *kgsl_sync_pt_dup(struct sync_pt *pt)

{

	struct kgsl_sync_pt *kpt = (struct kgsl_sync_pt *) pt;

	return kgsl_sync_pt_create(sync_pt_parent(pt), kpt->context, kpt->timestamp);

	return kgsl_sync_pt_create(pt->parent, kpt->context, kpt->timestamp);

}



static int kgsl_sync_pt_has_signaled(struct sync_pt *pt)

{

	struct kgsl_sync_pt *kpt = (struct kgsl_sync_pt *) pt;

	struct kgsl_sync_timeline *ktimeline =

		 (struct kgsl_sync_timeline *) sync_pt_parent(pt);

		 (struct kgsl_sync_timeline *) pt->parent;

	unsigned int ts = kpt->timestamp;

	int ret = 0;

drivers/staging/android/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ config SYNC 
	bool "Synchronization framework"

	default n

	select ANON_INODES

	select DMA_SHARED_BUFFER

	---help---

	  This option enables the framework for synchronization between multiple

	  drivers.  Sync implementations can take advantage of hardware

drivers/staging/android/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ obj-$(CONFIG_ASHMEM) += ashmem.o 
obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o

obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o

obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o

obj-$(CONFIG_SYNC)			+= sync.o sync_debug.o

obj-$(CONFIG_SYNC)			+= sync.o

obj-$(CONFIG_SW_SYNC)			+= sw_sync.o

obj-$(CONFIG_ONESHOT_SYNC)		+= oneshot_sync.o

drivers/staging/android/oneshot_sync.c

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct sync_pt *oneshot_pt_dup(struct sync_pt *sync_pt) 
		return NULL;



	out_pt = (struct oneshot_sync_pt *)

		sync_pt_create(sync_pt_parent(sync_pt), sizeof(*out_pt));

		sync_pt_create(sync_pt->parent, sizeof(*out_pt));



	if (out_pt == NULL) {

		oneshot_state_put(pt->state);
@@ -164,8 +164,8 @@ static void oneshot_pt_free(struct sync_pt *sync_pt) 
{

	struct oneshot_sync_pt *pt = to_oneshot_pt(sync_pt);



	struct oneshot_sync_timeline *timeline = sync_pt_parent(sync_pt) ?

		to_oneshot_timeline(sync_pt_parent(sync_pt)) : NULL;

	struct oneshot_sync_timeline *timeline = sync_pt->parent ?

		to_oneshot_timeline(sync_pt->parent) : NULL;



	if (timeline != NULL) {

		spin_lock(&timeline->lock);

drivers/staging/android/sw_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct sync_pt *sw_sync_pt_dup(struct sync_pt *sync_pt) 
{

	struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt;

	struct sw_sync_timeline *obj =

		(struct sw_sync_timeline *)sync_pt_parent(sync_pt);

		(struct sw_sync_timeline *)sync_pt->parent;



	return (struct sync_pt *)sw_sync_pt_create(obj, pt->value);

}
@@ -58,7 +58,7 @@ static int sw_sync_pt_has_signaled(struct sync_pt *sync_pt) 
{

	struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt;

	struct sw_sync_timeline *obj =

		(struct sw_sync_timeline *)sync_pt_parent(sync_pt);

		(struct sw_sync_timeline *)sync_pt->parent;



	return sw_sync_cmp(obj->value, pt->value) >= 0;

}