| From 6cc2ecf588046e74a163780397cdce57ede0fbfc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 27 Aug 2024 09:53:37 -0700 |
| Subject: drm/msm: fix %s null argument error |
| |
| From: Sherry Yang <sherry.yang@oracle.com> |
| |
| [ Upstream commit 25b85075150fe8adddb096db8a4b950353045ee1 ] |
| |
| The following build error was triggered because of NULL string argument: |
| |
| BUILDSTDERR: drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c: In function 'mdp5_smp_dump': |
| BUILDSTDERR: drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c:352:51: error: '%s' directive argument is null [-Werror=format-overflow=] |
| BUILDSTDERR: 352 | drm_printf(p, "%s:%d\t%d\t%s\n", |
| BUILDSTDERR: | ^~ |
| BUILDSTDERR: drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c:352:51: error: '%s' directive argument is null [-Werror=format-overflow=] |
| |
| This happens from the commit a61ddb4393ad ("drm: enable (most) W=1 |
| warnings by default across the subsystem"). Using "(null)" instead |
| to fix it. |
| |
| Fixes: bc5289eed481 ("drm/msm/mdp5: add debugfs to show smp block status") |
| Signed-off-by: Sherry Yang <sherry.yang@oracle.com> |
| Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> |
| Patchwork: https://patchwork.freedesktop.org/patch/611071/ |
| Link: https://lore.kernel.org/r/20240827165337.1075904-1-sherry.yang@oracle.com |
| Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c |
| index 3a7f7edda96b2..500b7dc895d05 100644 |
| --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c |
| +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c |
| @@ -351,7 +351,7 @@ void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p, |
| |
| drm_printf(p, "%s:%d\t%d\t%s\n", |
| pipe2name(pipe), j, inuse, |
| - plane ? plane->name : NULL); |
| + plane ? plane->name : "(null)"); |
| |
| total += inuse; |
| } |
| -- |
| 2.43.0 |
| |
