2024-04-02 21:54:43

by Liviu Dudau

[permalink] [raw]
Subject: [PATCH 1/2] drm/panthor: Cleanup unused variable 'cookie'

Commit 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in
_irq_suspend/resume()") removed the code that used the 'cookie' variable
but left the declaration in place. Remove it.

Fixes: 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()")
Cc: Boris Brezillon <[email protected]>
Cc: Steven Price <[email protected]>
Signed-off-by: Liviu Dudau <[email protected]>
---
drivers/gpu/drm/panthor/panthor_device.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h
index dc3e9c666b5bd4..2fdd671b38fd9b 100644
--- a/drivers/gpu/drm/panthor/panthor_device.h
+++ b/drivers/gpu/drm/panthor/panthor_device.h
@@ -323,8 +323,6 @@ static irqreturn_t panthor_ ## __name ## _irq_threaded_handler(int irq, void *da
\
static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq) \
{ \
- int cookie; \
- \
pirq->mask = 0; \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
synchronize_irq(pirq->irq); \
@@ -333,8 +331,6 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
\
static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u32 mask) \
{ \
- int cookie; \
- \
atomic_set(&pirq->suspended, false); \
pirq->mask = mask; \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \
--
2.44.0



2024-04-02 21:54:50

by Liviu Dudau

[permalink] [raw]
Subject: [PATCH 2/2] drm/panthor: Fix some kerneldoc warnings

When compiling with W=1 the build process will flag empty comments,
misnamed documented variables and incorrect tagging of functions.
Fix them in one go.

Fixes: de8548813824 ("drm/panthor: Add the scheduler logical block")
Cc: Boris Brezillon <[email protected]>
Cc: Steven Price <[email protected]>
Signed-off-by: Liviu Dudau <[email protected]>
---
drivers/gpu/drm/panthor/panthor_sched.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
index e5a710f190d2a8..a787f2fea33e98 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.c
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
@@ -517,7 +517,7 @@ struct panthor_group {
/** @max_compute_cores: Maximum number of shader cores used for compute jobs. */
u8 max_compute_cores;

- /** @max_compute_cores: Maximum number of shader cores used for fragment jobs. */
+ /** @max_fragment_cores: Maximum number of shader cores used for fragment jobs. */
u8 max_fragment_cores;

/** @max_tiler_cores: Maximum number of tiler cores used for tiler jobs. */
@@ -993,7 +993,7 @@ cs_slot_prog_locked(struct panthor_device *ptdev, u32 csg_id, u32 cs_id)
}

/**
- * @cs_slot_reset_locked() - Reset a queue slot
+ * cs_slot_reset_locked() - Reset a queue slot
* @ptdev: Device.
* @csg_id: Group slot.
* @cs_id: Queue slot.
@@ -1591,7 +1591,7 @@ static void sched_process_idle_event_locked(struct panthor_device *ptdev)
}

/**
- * panthor_sched_process_global_irq() - Process the scheduling part of a global IRQ
+ * sched_process_global_irq_locked() - Process the scheduling part of a global IRQ
* @ptdev: Device.
*/
static void sched_process_global_irq_locked(struct panthor_device *ptdev)
@@ -1660,8 +1660,6 @@ static const struct dma_fence_ops panthor_queue_fence_ops = {
.get_timeline_name = queue_fence_get_timeline_name,
};

-/**
- */
struct panthor_csg_slots_upd_ctx {
u32 update_mask;
u32 timedout_mask;
--
2.44.0


2024-04-03 06:46:43

by Boris Brezillon

[permalink] [raw]
Subject: Re: [PATCH 1/2] drm/panthor: Cleanup unused variable 'cookie'

On Tue, 2 Apr 2024 22:54:22 +0100
Liviu Dudau <[email protected]> wrote:

> Commit 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in
> _irq_suspend/resume()") removed the code that used the 'cookie' variable
> but left the declaration in place. Remove it.
>
> Fixes: 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()")
> Cc: Boris Brezillon <[email protected]>
> Cc: Steven Price <[email protected]>
> Signed-off-by: Liviu Dudau <[email protected]>

Reviewed-by: Boris Brezillon <[email protected]>

> ---
> drivers/gpu/drm/panthor/panthor_device.h | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h
> index dc3e9c666b5bd4..2fdd671b38fd9b 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.h
> +++ b/drivers/gpu/drm/panthor/panthor_device.h
> @@ -323,8 +323,6 @@ static irqreturn_t panthor_ ## __name ## _irq_threaded_handler(int irq, void *da
> \
> static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq) \
> { \
> - int cookie; \
> - \
> pirq->mask = 0; \
> gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
> synchronize_irq(pirq->irq); \
> @@ -333,8 +331,6 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
> \
> static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u32 mask) \
> { \
> - int cookie; \
> - \
> atomic_set(&pirq->suspended, false); \
> pirq->mask = mask; \
> gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \


2024-04-03 06:46:56

by Boris Brezillon

[permalink] [raw]
Subject: Re: [PATCH 2/2] drm/panthor: Fix some kerneldoc warnings

On Tue, 2 Apr 2024 22:54:23 +0100
Liviu Dudau <[email protected]> wrote:

> When compiling with W=1 the build process will flag empty comments,
> misnamed documented variables and incorrect tagging of functions.
> Fix them in one go.
>
> Fixes: de8548813824 ("drm/panthor: Add the scheduler logical block")
> Cc: Boris Brezillon <[email protected]>
> Cc: Steven Price <[email protected]>
> Signed-off-by: Liviu Dudau <[email protected]>

Reviewed-by: Boris Brezillon <[email protected]>

> ---
> drivers/gpu/drm/panthor/panthor_sched.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
> index e5a710f190d2a8..a787f2fea33e98 100644
> --- a/drivers/gpu/drm/panthor/panthor_sched.c
> +++ b/drivers/gpu/drm/panthor/panthor_sched.c
> @@ -517,7 +517,7 @@ struct panthor_group {
> /** @max_compute_cores: Maximum number of shader cores used for compute jobs. */
> u8 max_compute_cores;
>
> - /** @max_compute_cores: Maximum number of shader cores used for fragment jobs. */
> + /** @max_fragment_cores: Maximum number of shader cores used for fragment jobs. */
> u8 max_fragment_cores;
>
> /** @max_tiler_cores: Maximum number of tiler cores used for tiler jobs. */
> @@ -993,7 +993,7 @@ cs_slot_prog_locked(struct panthor_device *ptdev, u32 csg_id, u32 cs_id)
> }
>
> /**
> - * @cs_slot_reset_locked() - Reset a queue slot
> + * cs_slot_reset_locked() - Reset a queue slot
> * @ptdev: Device.
> * @csg_id: Group slot.
> * @cs_id: Queue slot.
> @@ -1591,7 +1591,7 @@ static void sched_process_idle_event_locked(struct panthor_device *ptdev)
> }
>
> /**
> - * panthor_sched_process_global_irq() - Process the scheduling part of a global IRQ
> + * sched_process_global_irq_locked() - Process the scheduling part of a global IRQ
> * @ptdev: Device.
> */
> static void sched_process_global_irq_locked(struct panthor_device *ptdev)
> @@ -1660,8 +1660,6 @@ static const struct dma_fence_ops panthor_queue_fence_ops = {
> .get_timeline_name = queue_fence_get_timeline_name,
> };
>
> -/**
> - */
> struct panthor_csg_slots_upd_ctx {
> u32 update_mask;
> u32 timedout_mask;


2024-04-03 07:18:06

by Boris Brezillon

[permalink] [raw]
Subject: Re: [PATCH 1/2] drm/panthor: Cleanup unused variable 'cookie'

On Tue, 2 Apr 2024 22:54:22 +0100
Liviu Dudau <[email protected]> wrote:

> Commit 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in
> _irq_suspend/resume()") removed the code that used the 'cookie' variable
> but left the declaration in place. Remove it.
>
> Fixes: 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()")
> Cc: Boris Brezillon <[email protected]>
> Cc: Steven Price <[email protected]>
> Signed-off-by: Liviu Dudau <[email protected]>

Queued both patches to drm-misc-next.

> ---
> drivers/gpu/drm/panthor/panthor_device.h | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h
> index dc3e9c666b5bd4..2fdd671b38fd9b 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.h
> +++ b/drivers/gpu/drm/panthor/panthor_device.h
> @@ -323,8 +323,6 @@ static irqreturn_t panthor_ ## __name ## _irq_threaded_handler(int irq, void *da
> \
> static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq) \
> { \
> - int cookie; \
> - \
> pirq->mask = 0; \
> gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
> synchronize_irq(pirq->irq); \
> @@ -333,8 +331,6 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
> \
> static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u32 mask) \
> { \
> - int cookie; \
> - \
> atomic_set(&pirq->suspended, false); \
> pirq->mask = mask; \
> gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \