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

Commit b9d2ec88 authored by Ingrid Gallardo's avatar Ingrid Gallardo
Browse files

android: sync: fix compilation errors when reverting sync fence api 



Fix compilation errors when reverting sync driver
changes to avoid using dma-buf sync fence APIs.
These changes are causing some random stability
issues, reverting changes until root cause is found.

Change-Id: I4131b9535c27b4615976de1a9ffe576088c7a89e
Signed-off-by: default avatarIngrid Gallardo <ingridg@codeaurora.org>
parent d512f075

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/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);

include/linux/sync.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
struct sync_timeline;

struct sync_pt;

struct sync_fence;

struct seq_file;



/**

 * struct sync_timeline_ops - sync object implementation ops