Unverified Commit 24c478ea authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/fourcc: Pass the format_info pointer to drm_format_plane_cpp 



So far, the drm_format_plane_cpp function was operating on the format's
fourcc and was doing a lookup to retrieve the drm_format_info structure and
return the cpp.

However, this is inefficient since in most cases, we will have the
drm_format_info pointer already available so we shouldn't have to perform a
new lookup. Some drm_fourcc functions also already operate on the
drm_format_info pointer for that reason, so the API is quite inconsistent
there.

Let's follow the latter pattern and remove the extra lookup while being a
bit more consistent. In order to be extra consistent, also rename that
function to drm_format_info_plane_cpp and to a static function in the
header to match the current policy.

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/32aa13e53dbc98a90207fd290aa8e79f785fb11e.1558002671.git-series.maxime.ripard@bootlin.com
parent f3e9632c

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

+3 −1
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ 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);

	struct amdgpu_device *adev = rfbdev->adev;

	struct drm_gem_object *gobj = NULL;

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

	u32 cpp;



	cpp = drm_format_plane_cpp(mode_cmd->pixel_format, 0);

	cpp = drm_format_info_plane_cpp(info, 0);



	/* need to align pitch with crtc limits */

	mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp,

drivers/gpu/drm/arm/malidp_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -382,7 +382,8 @@ static void malidp500_modeset(struct malidp_hw_device *hwdev, struct videomode * 


int malidp_format_get_bpp(u32 fmt)

{

	int bpp = drm_format_plane_cpp(fmt, 0) * 8;

	const struct drm_format_info *info = drm_format_info(fmt);

	int bpp = drm_format_info_plane_cpp(info, 0) * 8;



	if (bpp == 0) {

		switch (fmt) {

drivers/gpu/drm/arm/malidp_planes.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ bool malidp_format_mod_supported(struct drm_device *drm, 


	if (modifier & AFBC_SPLIT) {

		if (!info->is_yuv) {

			if (drm_format_plane_cpp(format, 0) <= 2) {

			if (drm_format_info_plane_cpp(info, 0) <= 2) {

				DRM_DEBUG_KMS("RGB formats <= 16bpp are not supported with SPLIT\n");

				return false;

			}

drivers/gpu/drm/drm_client.c

+2 −1
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer) 
static struct drm_client_buffer *

drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format)

{

	const struct drm_format_info *info = drm_format_info(format);

	struct drm_mode_create_dumb dumb_args = { };

	struct drm_device *dev = client->dev;

	struct drm_client_buffer *buffer;
@@ -258,7 +259,7 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u 


	dumb_args.width = width;

	dumb_args.height = height;

	dumb_args.bpp = drm_format_plane_cpp(format, 0) * 8;

	dumb_args.bpp = drm_format_info_plane_cpp(info, 0) * 8;

	ret = drm_mode_create_dumb(dev, &dumb_args, client->file);

	if (ret)

		goto err_delete;

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static void drm_fb_helper_dirty_blit_real(struct drm_fb_helper *fb_helper, 
					  struct drm_clip_rect *clip)

{

	struct drm_framebuffer *fb = fb_helper->fb;

	unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0);

	unsigned int cpp = drm_format_info_plane_cpp(fb->format, 0);

	size_t offset = clip->y1 * fb->pitches[0] + clip->x1 * cpp;

	void *src = fb_helper->fbdev->screen_buffer + offset;

	void *dst = fb_helper->buffer->vaddr + offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE