Unverified Commit 92f08076 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Replace instances of drm_format_info by drm_get_format_info 



drm_get_format_info directly calls into drm_format_info, but takes directly
a struct drm_mode_fb_cmd2 pointer, instead of the fourcc directly. It's
shorter to not dereference it, and we can customise the behaviour at the
driver level if we want to, so let's switch to it where it makes sense.

Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5859d68664b8f0804a56e7386937f6db986b9e0f.1558002671.git-series.maxime.ripard@bootlin.com
parent bf39607c

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

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
					 struct drm_mode_fb_cmd2 *mode_cmd,

					 struct drm_gem_object **gobj_p)

{

	const struct drm_format_info *info = drm_get_format_info(dev,

								 mode_cmd);

	const struct drm_format_info *info;

	struct amdgpu_device *adev = rfbdev->adev;

	struct drm_gem_object *gobj = NULL;

	struct amdgpu_bo *abo = NULL;
@@ -133,6 +132,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	int height = mode_cmd->height;

	u32 cpp;



	info = drm_get_format_info(adev->ddev, mode_cmd);

	cpp = drm_format_info_plane_cpp(info, 0);



	/* need to align pitch with crtc limits */

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int psb_framebuffer_init(struct drm_device *dev, 
	 * Reject unknown formats, YUV formats, and formats with more than

	 * 4 bytes per pixel.

	 */

	info = drm_format_info(mode_cmd->pixel_format);

	info = drm_get_format_info(dev, mode_cmd);

	if (!info || !info->depth || info->cpp[0] > 4)

		return -EINVAL;

drivers/gpu/drm/omapdrm/omap_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
			dev, mode_cmd, mode_cmd->width, mode_cmd->height,

			(char *)&mode_cmd->pixel_format);



	format = drm_format_info(mode_cmd->pixel_format);

	format = drm_get_format_info(dev, mode_cmd);



	for (i = 0; i < ARRAY_SIZE(formats); i++) {

		if (formats[i] == mode_cmd->pixel_format)

CRA Git | Maintained and supported by SUSTech CRA and CCSE