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

Commit ac330f45 authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Drop unnecessary host1x argument 



Functions taking a pointer to a host1x syncpoint as an argument don't
need to specify a pointer to a host1x instance because it can be
obtained from the syncpoint.

Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent d4ad3ad9

drivers/gpu/host1x/hw/channel_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int channel_submit(struct host1x_job *job) 
	trace_host1x_channel_submitted(dev_name(ch->dev), prev_max, syncval);



	/* schedule a submit complete interrupt */

	err = host1x_intr_add_action(host, job->syncpt_id, syncval,

	err = host1x_intr_add_action(host, sp, syncval,

				     HOST1X_INTR_ACTION_SUBMIT_COMPLETE, ch,

				     completed_waiter, NULL);

	completed_waiter = NULL;

drivers/gpu/host1x/intr.c

+6 −8
Original line number Diff line number Diff line
@@ -211,11 +211,11 @@ static void syncpt_thresh_work(struct work_struct *work) 
				host1x_syncpt_load(host->syncpt + id));

}



int host1x_intr_add_action(struct host1x *host, unsigned int id, u32 thresh,

			   enum host1x_intr_action action, void *data,

			   struct host1x_waitlist *waiter, void **ref)

int host1x_intr_add_action(struct host1x *host, struct host1x_syncpt *syncpt,

			   u32 thresh, enum host1x_intr_action action,

			   void *data, struct host1x_waitlist *waiter,

			   void **ref)

{

	struct host1x_syncpt *syncpt;

	int queue_was_empty;



	if (waiter == NULL) {
@@ -234,19 +234,17 @@ int host1x_intr_add_action(struct host1x *host, unsigned int id, u32 thresh, 
	waiter->data = data;

	waiter->count = 1;



	syncpt = host->syncpt + id;



	spin_lock(&syncpt->intr.lock);



	queue_was_empty = list_empty(&syncpt->intr.wait_head);



	if (add_waiter_to_queue(waiter, &syncpt->intr.wait_head)) {

		/* added at head of list - new threshold value */

		host1x_hw_intr_set_syncpt_threshold(host, id, thresh);

		host1x_hw_intr_set_syncpt_threshold(host, syncpt->id, thresh);



		/* added as first waiter - enable interrupt */

		if (queue_was_empty)

			host1x_hw_intr_enable_syncpt_intr(host, id);

			host1x_hw_intr_enable_syncpt_intr(host, syncpt->id);

	}



	spin_unlock(&syncpt->intr.lock);

drivers/gpu/host1x/intr.h

+5 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/interrupt.h>

#include <linux/workqueue.h>



struct host1x_syncpt;

struct host1x;



enum host1x_intr_action {
@@ -75,9 +76,10 @@ struct host1x_waitlist { 
 *

 * This is a non-blocking api.

 */

int host1x_intr_add_action(struct host1x *host, unsigned int id, u32 thresh,

	enum host1x_intr_action action, void *data,

	struct host1x_waitlist *waiter, void **ref);

int host1x_intr_add_action(struct host1x *host, struct host1x_syncpt *syncpt,

			   u32 thresh, enum host1x_intr_action action,

			   void *data, struct host1x_waitlist *waiter,

			   void **ref);



/*

 * Unreference an action submitted to host1x_intr_add_action().

drivers/gpu/host1x/syncpt.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout, 
	}



	/* schedule a wakeup when the syncpoint value is reached */

	err = host1x_intr_add_action(sp->host, sp->id, thresh,

	err = host1x_intr_add_action(sp->host, sp, thresh,

				     HOST1X_INTR_ACTION_WAKEUP_INTERRUPTIBLE,

				     &wq, waiter, &ref);

	if (err)