On 21/06/2021 14:38, Boris Brezillon wrote:
> Currently unused. We'll add it back if we need per-GPU definitions.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
Reviewed-by: Steven Price <steven.price@xxxxxxx>
Side note: we could use the definitions such as JS_STATUS_EVENT_ACTIVE
in panfrost_exception_name() rather than magic numbers. Although I do
find this function a handy mapping between codes and names to refer to! ;)
Steve
> ---
> drivers/gpu/drm/panfrost/panfrost_device.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_device.h | 2 +-
> drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_job.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
> index a2a09c51eed7..f7f5ca94f910 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.c
> @@ -292,7 +292,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev)
> panfrost_clk_fini(pfdev);
> }
>
> -const char *panfrost_exception_name(struct panfrost_device *pfdev, u32 exception_code)
> +const char *panfrost_exception_name(u32 exception_code)
> {
> switch (exception_code) {
> /* Non-Fault Status code */
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
> index 8b2cdb8c701d..2fe1550da7f8 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.h
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.h
> @@ -173,6 +173,6 @@ void panfrost_device_reset(struct panfrost_device *pfdev);
> int panfrost_device_resume(struct device *dev);
> int panfrost_device_suspend(struct device *dev);
>
> -const char *panfrost_exception_name(struct panfrost_device *pfdev, u32 exception_code);
> +const char *panfrost_exception_name(u32 exception_code);
>
> #endif
> diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> index 0e70e27fd8c3..26e4196b6c90 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> @@ -33,7 +33,7 @@ static irqreturn_t panfrost_gpu_irq_handler(int irq, void *data)
> address |= gpu_read(pfdev, GPU_FAULT_ADDRESS_LO);
>
> dev_warn(pfdev->dev, "GPU Fault 0x%08x (%s) at 0x%016llx\n",
> - fault_status & 0xFF, panfrost_exception_name(pfdev, fault_status),
> + fault_status & 0xFF, panfrost_exception_name(fault_status),
> address);
>
> if (state & GPU_IRQ_MULTIPLE_FAULT)
> diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
> index 3757c6eb3023..1be80b3dd5d0 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_job.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_job.c
> @@ -500,7 +500,7 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
>
> dev_err(pfdev->dev, "js fault, js=%d, status=%s, head=0x%x, tail=0x%x",
> j,
> - panfrost_exception_name(pfdev, job_read(pfdev, JS_STATUS(j))),
> + panfrost_exception_name(job_read(pfdev, JS_STATUS(j))),
> job_read(pfdev, JS_HEAD_LO(j)),
> job_read(pfdev, JS_TAIL_LO(j)));
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index 569509c2ba27..2a9bf30edc9d 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -675,7 +675,7 @@ static irqreturn_t panfrost_mmu_irq_handler_thread(int irq, void *data)
> "TODO",
> fault_status,
> (fault_status & (1 << 10) ? "DECODER FAULT" : "SLAVE FAULT"),
> - exception_type, panfrost_exception_name(pfdev, exception_type),
> + exception_type, panfrost_exception_name(exception_type),
> access_type, access_type_name(pfdev, fault_status),
> source_id);
>
>
