Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
On Tue 2021-02-16 09:37:45, Thomas Zimmermann wrote:
> Hi
>
> Am 15.02.21 um 12:40 schrieb Sakari Ailus:
> > Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a
> > large number of temporary variables at the same time.
> >
> > Signed-off-by: Sakari Ailus
> > ---
> > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c| 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c| 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 ++--
> > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--
> > .../arm/display/komeda/komeda_format_caps.h | 11
> > .../arm/display/komeda/komeda_framebuffer.c | 4 +--
> > .../gpu/drm/arm/display/komeda/komeda_plane.c | 6 ++---
> > drivers/gpu/drm/arm/malidp_mw.c | 7 ++
> > drivers/gpu/drm/drm_atomic.c | 8 ++
> > drivers/gpu/drm/drm_crtc.c| 7 ++
> > drivers/gpu/drm/drm_fourcc.c | 25 ---
> > drivers/gpu/drm/drm_framebuffer.c | 11 +++-
> > drivers/gpu/drm/drm_mipi_dbi.c| 5 ++--
> > drivers/gpu/drm/drm_plane.c | 8 ++
> > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 5 ++--
> > drivers/gpu/drm/i915/display/intel_display.c | 14 +++
> > .../drm/i915/display/intel_display_debugfs.c | 19 ++
> > drivers/gpu/drm/i915/display/intel_sprite.c | 6 ++---
> > drivers/gpu/drm/mcde/mcde_display.c | 6 ++---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++---
> > drivers/gpu/drm/nouveau/nouveau_display.c | 9 +++
> > drivers/gpu/drm/radeon/atombios_crtc.c| 10 +++-
> > drivers/gpu/drm/sun4i/sun4i_backend.c | 6 ++---
> > drivers/gpu/drm/vkms/vkms_writeback.c | 7 ++
> > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 +--
> > include/drm/drm_fourcc.h | 1 -
> > 27 files changed, 64 insertions(+), 157 deletions(-)
>
> This is a nice patchset. For the driver-related changes:
>
> Acked-by: Thomas Zimmermann
>
> But landing this patch will certainly give us build errors. There are at
> least 3 git trees involved: drm-misc-next, amd and i915. I'd expect at least
> one of them to have additional changes that still require
> drm_get_format_name().
>
> IMHO we should remove drm_get_format_name() in a later patch. Please remove
> the changes in drm_fourcc.{c,h} from this patch and maybe add a TODO comment
> to the declaration that the function is supposed to be removed.
>
> I would merge the patchset through drm-misc-next. And the final removal
> patch during the next cycle. Ok?
Sounds like a plan. I am fine with it from the vsprintf side.
Best Regards,
Petr
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
Hi Thomas,
Thanks for the review.
On Tue, Feb 16, 2021 at 09:37:45AM +0100, Thomas Zimmermann wrote:
> Hi
>
> Am 15.02.21 um 12:40 schrieb Sakari Ailus:
> > Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a
> > large number of temporary variables at the same time.
> >
> > Signed-off-by: Sakari Ailus
> > ---
> > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c| 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c| 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 ++--
> > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 ++--
> > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--
> > .../arm/display/komeda/komeda_format_caps.h | 11
> > .../arm/display/komeda/komeda_framebuffer.c | 4 +--
> > .../gpu/drm/arm/display/komeda/komeda_plane.c | 6 ++---
> > drivers/gpu/drm/arm/malidp_mw.c | 7 ++
> > drivers/gpu/drm/drm_atomic.c | 8 ++
> > drivers/gpu/drm/drm_crtc.c| 7 ++
> > drivers/gpu/drm/drm_fourcc.c | 25 ---
> > drivers/gpu/drm/drm_framebuffer.c | 11 +++-
> > drivers/gpu/drm/drm_mipi_dbi.c| 5 ++--
> > drivers/gpu/drm/drm_plane.c | 8 ++
> > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 5 ++--
> > drivers/gpu/drm/i915/display/intel_display.c | 14 +++
> > .../drm/i915/display/intel_display_debugfs.c | 19 ++
> > drivers/gpu/drm/i915/display/intel_sprite.c | 6 ++---
> > drivers/gpu/drm/mcde/mcde_display.c | 6 ++---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++---
> > drivers/gpu/drm/nouveau/nouveau_display.c | 9 +++
> > drivers/gpu/drm/radeon/atombios_crtc.c| 10 +++-
> > drivers/gpu/drm/sun4i/sun4i_backend.c | 6 ++---
> > drivers/gpu/drm/vkms/vkms_writeback.c | 7 ++
> > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 +--
> > include/drm/drm_fourcc.h | 1 -
> > 27 files changed, 64 insertions(+), 157 deletions(-)
>
> This is a nice patchset. For the driver-related changes:
>
> Acked-by: Thomas Zimmermann
>
> But landing this patch will certainly give us build errors. There are at
> least 3 git trees involved: drm-misc-next, amd and i915. I'd expect at least
> one of them to have additional changes that still require
> drm_get_format_name().
>
> IMHO we should remove drm_get_format_name() in a later patch. Please remove
> the changes in drm_fourcc.{c,h} from this patch and maybe add a TODO comment
> to the declaration that the function is supposed to be removed.
>
> I would merge the patchset through drm-misc-next. And the final removal
> patch during the next cycle. Ok?
Sounds good. I'll split the third patch into two then.
--
Kind regards,
Sakari Ailus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
Hi
Am 15.02.21 um 12:40 schrieb Sakari Ailus:
Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a
large number of temporary variables at the same time.
Signed-off-by: Sakari Ailus
---
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c| 5 ++--
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c| 5 ++--
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 ++--
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 ++--
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--
.../arm/display/komeda/komeda_format_caps.h | 11
.../arm/display/komeda/komeda_framebuffer.c | 4 +--
.../gpu/drm/arm/display/komeda/komeda_plane.c | 6 ++---
drivers/gpu/drm/arm/malidp_mw.c | 7 ++
drivers/gpu/drm/drm_atomic.c | 8 ++
drivers/gpu/drm/drm_crtc.c| 7 ++
drivers/gpu/drm/drm_fourcc.c | 25 ---
drivers/gpu/drm/drm_framebuffer.c | 11 +++-
drivers/gpu/drm/drm_mipi_dbi.c| 5 ++--
drivers/gpu/drm/drm_plane.c | 8 ++
.../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 5 ++--
drivers/gpu/drm/i915/display/intel_display.c | 14 +++
.../drm/i915/display/intel_display_debugfs.c | 19 ++
drivers/gpu/drm/i915/display/intel_sprite.c | 6 ++---
drivers/gpu/drm/mcde/mcde_display.c | 6 ++---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++---
drivers/gpu/drm/nouveau/nouveau_display.c | 9 +++
drivers/gpu/drm/radeon/atombios_crtc.c| 10 +++-
drivers/gpu/drm/sun4i/sun4i_backend.c | 6 ++---
drivers/gpu/drm/vkms/vkms_writeback.c | 7 ++
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 +--
include/drm/drm_fourcc.h | 1 -
27 files changed, 64 insertions(+), 157 deletions(-)
This is a nice patchset. For the driver-related changes:
Acked-by: Thomas Zimmermann
But landing this patch will certainly give us build errors. There are at
least 3 git trees involved: drm-misc-next, amd and i915. I'd expect at
least one of them to have additional changes that still require
drm_get_format_name().
IMHO we should remove drm_get_format_name() in a later patch. Please
remove the changes in drm_fourcc.{c,h} from this patch and maybe add a
TODO comment to the declaration that the function is supposed to be removed.
I would merge the patchset through drm-misc-next. And the final removal
patch during the next cycle. Ok?
Best regard
Thomas
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 7944781e1086..ea825b4f8ee8 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1862,7 +1862,6 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc
*crtc,
u32 tmp, viewport_w, viewport_h;
int r;
bool bypass_lut = false;
- struct drm_format_name_buf format_name;
/* no fb bound */
if (!atomic && !crtc->primary->fb) {
@@ -1981,8 +1980,8 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc
*crtc,
#endif
break;
default:
- DRM_ERROR("Unsupported screen format %s\n",
- drm_get_format_name(target_fb->format->format,
_name));
+ DRM_ERROR("Unsupported screen format %p4cc\n",
+ _fb->format->format);
return -EINVAL;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 1b6ff0470011..a360a6dec198 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -1904,7 +1904,6 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc
*crtc,
u32 tmp, viewport_w, viewport_h;
int r;
bool bypass_lut = false;
- struct drm_format_name_buf format_name;
/* no fb bound */
if (!atomic && !crtc->primary->fb) {
@@ -2023,8 +2022,8 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc
*crtc,
#endif
break;
default:
- DRM_ERROR("Unsupported screen format %s\n",
- drm_get_format_name(target_fb->format->format,
_name));
+ DRM_ERROR("Unsupported screen format %p4cc\n",
+ _fb->format->format);
return -EINVAL;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 83a88385b762..ef124ac853b6 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1820,7 +1820,6 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc
*crtc,
u32 viewport_w, viewport_h;
int r;
bool bypass_lut = false;
- struct drm_format_name_buf format_name;
/* no fb bound */
if (!atomic && !crtc->primary->fb) {
@@ -1929,8 +1928,8 @@
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
On Mon 2021-02-15 13:40:30, Sakari Ailus wrote: > Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a > large number of temporary variables at the same time. > > Signed-off-by: Sakari Ailus Reviewed-by: Petr Mladek I wonder if I could this via printk tree. Or if should rather go via DRM tree. Anyway, there will be v8 with small changes in the 1st patch. Best Regards, Petr ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
On Mon, Feb 15, 2021 at 07:26:55PM +0200, Sakari Ailus wrote:
> On Mon, Feb 15, 2021 at 03:41:14PM +0200, Andy Shevchenko wrote:
> ...
> > > + seq_printf(m, "\t\tuapi: [FB:%d] ", fb ? fb->base.id : 0);
> > > + if (fb)
> > > + seq_printf(m, "%p4cc", >format->format);
> > > + else
> > > + seq_puts(m, "n/a");
> >
> > > + seq_printf(m, ",0x%llx,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ",
> > > dst=" DRM_RECT_FMT ", rotation=%s\n",
> >
> > Why not to keep two seq_printf() calls?
> >
> > if (fb) {
> > seq_printf();
> > } else {
> > seq_printf();
> > }
> >
> > ?
>
> I could, but it'd repeat a lot of the same format string that is very
> complicated right now. Therefore I thought it's better to split.
It's fine, why not?
> Or do you mean seq_printf() vs. seq_puts()? checkpatch.pl (rightly) warns
> about it.
If it doesn't take run-time parameters, then definitely
if (fb)
seq_printf();
else
seq_puts();
> > > fb ? fb->modifier : 0,
> > > fb ? fb->width : 0, fb ? fb->height : 0,
> > > plane_visibility(plane_state),
--
With Best Regards,
Andy Shevchenko
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
On Mon, Feb 15, 2021 at 03:41:14PM +0200, Andy Shevchenko wrote:
...
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > index ca41e8c00ad7..a5c9fe2e56b3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > @@ -771,21 +771,21 @@ static void intel_plane_uapi_info(struct seq_file *m,
> > struct intel_plane *plane)
> > const struct intel_plane_state *plane_state =
> > to_intel_plane_state(plane->base.state);
> > const struct drm_framebuffer *fb = plane_state->uapi.fb;
> > - struct drm_format_name_buf format_name;
> > struct drm_rect src, dst;
> > char rot_str[48];
> >
> > src = drm_plane_state_src(_state->uapi);
> > dst = drm_plane_state_dest(_state->uapi);
> >
> > - if (fb)
> > - drm_get_format_name(fb->format->format, _name);
> > -
> > plane_rotation(rot_str, sizeof(rot_str),
> >plane_state->uapi.rotation);
> >
> > - seq_printf(m, "\t\tuapi: [FB:%d] %s,0x%llx,%dx%d, visible=%s, src="
> > DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
> > - fb ? fb->base.id : 0, fb ? format_name.str : "n/a",
> > + seq_printf(m, "\t\tuapi: [FB:%d] ", fb ? fb->base.id : 0);
> > + if (fb)
> > + seq_printf(m, "%p4cc", >format->format);
> > + else
> > + seq_puts(m, "n/a");
>
> > + seq_printf(m, ",0x%llx,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ",
> > dst=" DRM_RECT_FMT ", rotation=%s\n",
>
> Why not to keep two seq_printf() calls?
>
> if (fb) {
> seq_printf();
> } else {
> seq_printf();
> }
>
> ?
I could, but it'd repeat a lot of the same format string that is very
complicated right now. Therefore I thought it's better to split.
Or do you mean seq_printf() vs. seq_puts()? checkpatch.pl (rightly) warns
about it.
>
> >fb ? fb->modifier : 0,
> >fb ? fb->width : 0, fb ? fb->height : 0,
> >plane_visibility(plane_state),
--
Sakari Ailus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
Hi Andy,
On Mon, Feb 15, 2021 at 03:41:14PM +0200, Andy Shevchenko wrote:
> On Mon, Feb 15, 2021 at 01:40:30PM +0200, Sakari Ailus wrote:
> > Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a
> > large number of temporary variables at the same time.
>
> What a nice clean up!
> Reviewed-by: Andy Shevchenko
Thanks!
> after addressing nit-picks below.
>
> Side note (no need to implement esp. right now): it seems often it's coupled
> with modifier, would be nice to have them together that %p4ccM or so can do it
> in one go.
...
> > diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> > index 03262472059c..5cf45aa6eedc 100644
> > --- a/drivers/gpu/drm/drm_fourcc.c
> > +++ b/drivers/gpu/drm/drm_fourcc.c
> > @@ -30,11 +30,6 @@
> > #include
> > #include
> >
> > -static char printable_char(int c)
> > -{
> > - return isascii(c) && isprint(c) ? c : '?';
> > -}
>
> If it goes as an ABI than your dot is incompatible with this and '?' should be
> used instead in the patch 1. And I bend towards suggested '?' rather than '.'.
>
> Also it means that you probably would need different specifiers for full and
> short formats.
I thought of that, but then the resulting string would be indeed different
and comparing short and long formats would be harder. Remember this is for
debug prints. If the format is too long, then it should be made shorter,
but during the earlier review rounds people have expressed interest in
having this information there.
"?" can be expanded by the shell whereas "." is not. If DRM folks think we
should go back to "?" I'm fine with that. Also note that there's something
wrong with the fourcc code to begin with if it's got either "." or "?".
--
Regards,
Sakari Ailus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 3/3] drm: Switch to %p4cc format modifier
On Mon, Feb 15, 2021 at 01:40:30PM +0200, Sakari Ailus wrote:
> Switch DRM drivers from drm_get_format_name() to %p4cc. This gets rid of a
> large number of temporary variables at the same time.
What a nice clean up!
Reviewed-by: Andy Shevchenko
after addressing nit-picks below.
Side note (no need to implement esp. right now): it seems often it's coupled
with modifier, would be nice to have them together that %p4ccM or so can do it
in one go.
> Signed-off-by: Sakari Ailus
> ---
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c| 5 ++--
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c| 5 ++--
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 ++--
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 ++--
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--
> .../arm/display/komeda/komeda_format_caps.h | 11
> .../arm/display/komeda/komeda_framebuffer.c | 4 +--
> .../gpu/drm/arm/display/komeda/komeda_plane.c | 6 ++---
> drivers/gpu/drm/arm/malidp_mw.c | 7 ++
> drivers/gpu/drm/drm_atomic.c | 8 ++
> drivers/gpu/drm/drm_crtc.c| 7 ++
> drivers/gpu/drm/drm_fourcc.c | 25 ---
> drivers/gpu/drm/drm_framebuffer.c | 11 +++-
> drivers/gpu/drm/drm_mipi_dbi.c| 5 ++--
> drivers/gpu/drm/drm_plane.c | 8 ++
> .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 5 ++--
> drivers/gpu/drm/i915/display/intel_display.c | 14 +++
> .../drm/i915/display/intel_display_debugfs.c | 19 ++
> drivers/gpu/drm/i915/display/intel_sprite.c | 6 ++---
> drivers/gpu/drm/mcde/mcde_display.c | 6 ++---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++---
> drivers/gpu/drm/nouveau/nouveau_display.c | 9 +++
> drivers/gpu/drm/radeon/atombios_crtc.c| 10 +++-
> drivers/gpu/drm/sun4i/sun4i_backend.c | 6 ++---
> drivers/gpu/drm/vkms/vkms_writeback.c | 7 ++
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 +--
> include/drm/drm_fourcc.h | 1 -
> 27 files changed, 64 insertions(+), 157 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 7944781e1086..ea825b4f8ee8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -1862,7 +1862,6 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> u32 tmp, viewport_w, viewport_h;
> int r;
> bool bypass_lut = false;
> - struct drm_format_name_buf format_name;
>
> /* no fb bound */
> if (!atomic && !crtc->primary->fb) {
> @@ -1981,8 +1980,8 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> #endif
> break;
> default:
> - DRM_ERROR("Unsupported screen format %s\n",
> - drm_get_format_name(target_fb->format->format,
> _name));
> + DRM_ERROR("Unsupported screen format %p4cc\n",
> + _fb->format->format);
> return -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 1b6ff0470011..a360a6dec198 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -1904,7 +1904,6 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> u32 tmp, viewport_w, viewport_h;
> int r;
> bool bypass_lut = false;
> - struct drm_format_name_buf format_name;
>
> /* no fb bound */
> if (!atomic && !crtc->primary->fb) {
> @@ -2023,8 +2022,8 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> #endif
> break;
> default:
> - DRM_ERROR("Unsupported screen format %s\n",
> - drm_get_format_name(target_fb->format->format,
> _name));
> + DRM_ERROR("Unsupported screen format %p4cc\n",
> + _fb->format->format);
> return -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 83a88385b762..ef124ac853b6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -1820,7 +1820,6 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> u32 viewport_w, viewport_h;
> int r;
> bool bypass_lut = false;
> - struct drm_format_name_buf format_name;
>
> /* no fb bound */
> if (!atomic && !crtc->primary->fb) {
> @@ -1929,8 +1928,8 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc
> *crtc,
> #endif
> break;
> default:
> - DRM_ERROR("Unsupported screen format %s\n",
> - drm_get_format_name(target_fb->format->format,
> _name));
> + DRM_ERROR("Unsupported
