[PATCH] drm/msm/gpu: fix parameters in function msm_gpu_crashstate_capture

[PATCH] drm/msm/gpu: fix parameters in function msm_gpu_crashstate_capture

[Anders Roxell]

When CONFIG_DEV_COREDUMP isn't defined msm_gpu_crashstate_capture
doesn't pass the correct parameters.
drivers/gpu/drm/msm/msm_gpu.c: In function ‘recover_worker’:
drivers/gpu/drm/msm/msm_gpu.c:479:34: error: passing argument 2 of ‘msm_gpu_crashstate_capture’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
                                  ^~~~~~
drivers/gpu/drm/msm/msm_gpu.c:388:13: note: expected ‘char *’ but argument is of type ‘struct msm_gem_submit *’
 static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,
             ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/msm/msm_gpu.c:479:2: error: too many arguments to function ‘msm_gpu_crashstate_capture’
  msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/msm/msm_gpu.c:388:13: note: declared here
 static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,

In current code the function msm_gpu_crashstate_capture parameters.

Fixes: cdb95931dea3 ("drm/msm/gpu: Add the buffer objects from the submit to the crash dump")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 drivers/gpu/drm/msm/msm_gpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index f388944c93e2..713a92b516ba 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -385,8 +385,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
 		msm_gpu_devcoredump_read, msm_gpu_devcoredump_free);
 }
 #else
-static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,
-		char *cmd)
+static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
+		struct msm_gem_submit *submit, char *comm, char *cmd)
 {
 }
 #endif
-- 
2.18.0

Re: [PATCH] drm/msm/gpu: fix parameters in function msm_gpu_crashstate_capture

[Jordan Crouse]

On Tue, Jul 31, 2018 at 10:45:32PM +0200, Anders Roxell wrote:
> When CONFIG_DEV_COREDUMP isn't defined msm_gpu_crashstate_capture
> doesn't pass the correct parameters.
> drivers/gpu/drm/msm/msm_gpu.c: In function ‘recover_worker’:
> drivers/gpu/drm/msm/msm_gpu.c:479:34: error: passing argument 2 of ‘msm_gpu_crashstate_capture’ from incompatible pointer type [-Werror=incompatible-pointer-types]
>   msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
>                                   ^~~~~~
> drivers/gpu/drm/msm/msm_gpu.c:388:13: note: expected ‘char *’ but argument is of type ‘struct msm_gem_submit *’
>  static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,
>              ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/msm/msm_gpu.c:479:2: error: too many arguments to function ‘msm_gpu_crashstate_capture’
>   msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/msm/msm_gpu.c:388:13: note: declared here
>  static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,
> 
> In current code the function msm_gpu_crashstate_capture parameters.
> 
> Fixes: cdb95931dea3 ("drm/msm/gpu: Add the buffer objects from the submit to the crash dump")
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Thanks for doing this.

Reviewed-By: Jordan Crouse <jcrouse@codeaurora.org>

> ---
>  drivers/gpu/drm/msm/msm_gpu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
> index f388944c93e2..713a92b516ba 100644
> --- a/drivers/gpu/drm/msm/msm_gpu.c
> +++ b/drivers/gpu/drm/msm/msm_gpu.c
> @@ -385,8 +385,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
>  		msm_gpu_devcoredump_read, msm_gpu_devcoredump_free);
>  }
>  #else
> -static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, char *comm,
> -		char *cmd)
> +static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
> +		struct msm_gem_submit *submit, char *comm, char *cmd)
>  {
>  }
>  #endif

-- 
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project