Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c5d064a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: vmwgfx: Replace drm_fb_get_bpp_depth() with drm_format_info() 



The driver is the last users of the drm_fb_get_bpp_depth() function. It
should ideally be converted to use struct drm_mode_fb_cmd2 instead of
the legacy struct drm_mode_fb_cmd internally, but that will require
broad changes across the code base. As a first step, replace
drm_fb_get_bpp_depth() with drm_format_info() in order to stop exporting
the function to drivers.

The new DRM_ERROR() message comes from the vmw_create_dmabuf_proxy(),
vmw_kms_new_framebuffer_surface() and vmw_kms_new_framebuffer_dmabuf()
functions that currently print an error if the pixel format is
unsupported.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-12-git-send-email-laurent.pinchart@ideasonboard.com
parent 802aaf76

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+10 −2
Original line number Diff line number Diff line
@@ -980,14 +980,22 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, 
	struct vmw_dma_buffer *bo = NULL;

	struct ttm_base_object *user_obj;

	struct drm_mode_fb_cmd mode_cmd;

	const struct drm_format_info *info;

	int ret;



	info = drm_format_info(mode_cmd2->pixel_format);

	if (!info || !info->depth) {

		DRM_ERROR("Unsupported framebuffer format %s\n",

			  drm_get_format_name(mode_cmd2->pixel_format));

		return ERR_PTR(-EINVAL);

	}



	mode_cmd.width = mode_cmd2->width;

	mode_cmd.height = mode_cmd2->height;

	mode_cmd.pitch = mode_cmd2->pitches[0];

	mode_cmd.handle = mode_cmd2->handles[0];

	drm_fb_get_bpp_depth(mode_cmd2->pixel_format, &mode_cmd.depth,

				    &mode_cmd.bpp);

	mode_cmd.depth = info->depth;

	mode_cmd.bpp = info->cpp[0] * 8;



	/**

	 * This code should be conditioned on Screen Objects not being used.