Re: [PATCH 4/7] gpu: host1x: Drop unnecessary host1x argument

2018-05-21 Thread Dmitry Osipenko 
On 17.05.2018 18:34, Thierry Reding wrote:
> From: Thierry Reding 
> 
> 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.
> 
> Signed-off-by: Thierry Reding 
> ---
>  drivers/gpu/host1x/hw/channel_hw.c |  2 +-
>  drivers/gpu/host1x/intr.c  | 14 ++
>  drivers/gpu/host1x/intr.h  |  8 +---
>  drivers/gpu/host1x/syncpt.c|  2 +-
>  4 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/host1x/hw/channel_hw.c 
> b/drivers/gpu/host1x/hw/channel_hw.c
> index 4c9555038a95..d188f9068b91 100644
> --- a/drivers/gpu/host1x/hw/channel_hw.c
> +++ b/drivers/gpu/host1x/hw/channel_hw.c
> @@ -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;
> diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c
> index 6028cf7b681f..9629c009d10f 100644
> --- a/drivers/gpu/host1x/intr.c
> +++ b/drivers/gpu/host1x/intr.c
> @@ -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(>intr.lock);
>  
>   queue_was_empty = list_empty(>intr.wait_head);
>  
>   if (add_waiter_to_queue(waiter, >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(>intr.lock);
> diff --git a/drivers/gpu/host1x/intr.h b/drivers/gpu/host1x/intr.h
> index 1370c2bb75b8..6db96af484fe 100644
> --- a/drivers/gpu/host1x/intr.h
> +++ b/drivers/gpu/host1x/intr.h
> @@ -22,6 +22,7 @@
>  #include 
>  #include 
>  
> +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().
> diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
> index 088c05dd884c..a5dbf1ba4645 100644
> --- a/drivers/gpu/host1x/syncpt.c
> +++ b/drivers/gpu/host1x/syncpt.c
> @@ -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,
>, waiter, );
>   if (err)
> 

Reviewed-by: Dmitry Osipenko 
Tested-by: Dmitry Osipenko 
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 4/7] gpu: host1x: Drop unnecessary host1x argument

2018-05-17 Thread Thierry Reding 
From: Thierry Reding 

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.

Signed-off-by: Thierry Reding 
---
 drivers/gpu/host1x/hw/channel_hw.c |  2 +-
 drivers/gpu/host1x/intr.c  | 14 ++
 drivers/gpu/host1x/intr.h  |  8 +---
 drivers/gpu/host1x/syncpt.c|  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/host1x/hw/channel_hw.c 
b/drivers/gpu/host1x/hw/channel_hw.c
index 4c9555038a95..d188f9068b91 100644
--- a/drivers/gpu/host1x/hw/channel_hw.c
+++ b/drivers/gpu/host1x/hw/channel_hw.c
@@ -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;
diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c
index 6028cf7b681f..9629c009d10f 100644
--- a/drivers/gpu/host1x/intr.c
+++ b/drivers/gpu/host1x/intr.c
@@ -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(>intr.lock);
 
queue_was_empty = list_empty(>intr.wait_head);
 
if (add_waiter_to_queue(waiter, >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(>intr.lock);
diff --git a/drivers/gpu/host1x/intr.h b/drivers/gpu/host1x/intr.h
index 1370c2bb75b8..6db96af484fe 100644
--- a/drivers/gpu/host1x/intr.h
+++ b/drivers/gpu/host1x/intr.h
@@ -22,6 +22,7 @@
 #include 
 #include 
 
+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().
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
index 088c05dd884c..a5dbf1ba4645 100644
--- a/drivers/gpu/host1x/syncpt.c
+++ b/drivers/gpu/host1x/syncpt.c
@@ -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,
 , waiter, );
if (err)
-- 
2.17.0

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel