Commit 92f1d09c authored by Sakari Ailus's avatar Sakari Ailus Committed by Thomas Zimmermann
Browse files

drm: Switch to %p4cc format modifier 



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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210216155723.17109-4-sakari.ailus@linux.intel.com
parent e927e1e0

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+2 −3
Original line number Diff line number Diff line
@@ -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, &format_name));

		DRM_ERROR("Unsupported screen format %p4cc\n",

			  &target_fb->format->format);

		return -EINVAL;

	}

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+2 −3
Original line number Diff line number Diff line
@@ -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, &format_name));

		DRM_ERROR("Unsupported screen format %p4cc\n",

			  &target_fb->format->format);

		return -EINVAL;

	}

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+2 −3
Original line number Diff line number Diff line
@@ -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, &format_name));

		DRM_ERROR("Unsupported screen format %p4cc\n",

			  &target_fb->format->format);

		return -EINVAL;

	}

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+2 −3
Original line number Diff line number Diff line
@@ -1791,7 +1791,6 @@ static int dce_v8_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) {
@@ -1902,8 +1901,8 @@ static int dce_v8_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, &format_name));

		DRM_ERROR("Unsupported screen format %p4cc\n",

			  &target_fb->format->format);

		return -EINVAL;

	}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −3
Original line number Diff line number Diff line
@@ -4505,7 +4505,6 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev, 
	const struct drm_framebuffer *fb = plane_state->fb;

	const struct amdgpu_framebuffer *afb =

		to_amdgpu_framebuffer(plane_state->fb);

	struct drm_format_name_buf format_name;

	int ret;



	memset(plane_info, 0, sizeof(*plane_info));
@@ -4553,8 +4552,8 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev, 
		break;

	default:

		DRM_ERROR(

			"Unsupported screen format %s\n",

			drm_get_format_name(fb->format->format, &format_name));

			"Unsupported screen format %p4cc\n",

			&fb->format->format);

		return -EINVAL;

	}