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

Commit 0843010b authored by Archit Taneja's avatar Archit Taneja Committed by Daniel Vetter
Browse files

drm/virtio: Use new drm_fb_helper functions 



Use the newly created wrapper drm_fb_helper functions instead of calling
core fbdev functions directly. They also simplify the fb_info creation.

v3:
- Don't touch remove_conflicting_framebuffers

v2:
- add missing header for virtgpu_fb.c

Cc: David Airlie <airlied@linux.ie>
Cc: Gerd Hoffmann <kraxel@redhat.com>

Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2dbaf392

drivers/gpu/drm/virtio/virtgpu_fb.c

+9 −23
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ static void virtio_gpu_3d_fillrect(struct fb_info *info, 
				   const struct fb_fillrect *rect)

				   const struct fb_fillrect *rect)

{

{

	struct virtio_gpu_fbdev *vfbdev = info->par;

	struct virtio_gpu_fbdev *vfbdev = info->par;

	sys_fillrect(info, rect);

	drm_fb_helper_sys_fillrect(info, rect);

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, rect->dx, rect->dy,

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, rect->dx, rect->dy,

			     rect->width, rect->height);

			     rect->width, rect->height);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -183,7 +183,7 @@ static void virtio_gpu_3d_copyarea(struct fb_info *info, 
				   const struct fb_copyarea *area)

				   const struct fb_copyarea *area)

{

{

	struct virtio_gpu_fbdev *vfbdev = info->par;

	struct virtio_gpu_fbdev *vfbdev = info->par;

	sys_copyarea(info, area);

	drm_fb_helper_sys_copyarea(info, area);

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, area->dx, area->dy,

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, area->dx, area->dy,

			   area->width, area->height);

			   area->width, area->height);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -193,7 +193,7 @@ static void virtio_gpu_3d_imageblit(struct fb_info *info, 
				    const struct fb_image *image)

				    const struct fb_image *image)

{

{

	struct virtio_gpu_fbdev *vfbdev = info->par;

	struct virtio_gpu_fbdev *vfbdev = info->par;

	sys_imageblit(info, image);

	drm_fb_helper_sys_imageblit(info, image);

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, image->dx, image->dy,

	virtio_gpu_dirty_update(&vfbdev->vgfb, true, image->dx, image->dy,

			     image->width, image->height);

			     image->width, image->height);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);

	schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -230,7 +230,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	struct drm_framebuffer *fb;

	struct drm_framebuffer *fb;

	struct drm_mode_fb_cmd2 mode_cmd = {};

	struct drm_mode_fb_cmd2 mode_cmd = {};

	struct virtio_gpu_object *obj;

	struct virtio_gpu_object *obj;

	struct device *device = vgdev->dev;

	uint32_t resid, format, size;

	uint32_t resid, format, size;

	int ret;

	int ret;
@@ -317,18 +316,12 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	if (ret)

	if (ret)

		goto err_obj_attach;

		goto err_obj_attach;





	info = framebuffer_alloc(0, device);

	info = drm_fb_helper_alloc_fbi(helper);

	if (!info) {

	if (IS_ERR(info)) {

		ret = -ENOMEM;

		ret = PTR_ERR(info);

		goto err_fb_alloc;

		goto err_fb_alloc;

	}

	}





	ret = fb_alloc_cmap(&info->cmap, 256, 0);

	if (ret) {

		ret = -ENOMEM;

		goto err_fb_alloc_cmap;

	}



	info->par = helper;

	info->par = helper;





	ret = virtio_gpu_framebuffer_init(dev, &vfbdev->vgfb,

	ret = virtio_gpu_framebuffer_init(dev, &vfbdev->vgfb,
@@ -339,7 +332,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	fb = &vfbdev->vgfb.base;

	fb = &vfbdev->vgfb.base;





	vfbdev->helper.fb = fb;

	vfbdev->helper.fb = fb;

	vfbdev->helper.fbdev = info;





	strcpy(info->fix.id, "virtiodrmfb");

	strcpy(info->fix.id, "virtiodrmfb");

	info->flags = FBINFO_DEFAULT;

	info->flags = FBINFO_DEFAULT;
@@ -357,9 +349,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	return 0;

	return 0;





err_fb_init:

err_fb_init:

	fb_dealloc_cmap(&info->cmap);

	drm_fb_helper_release_fbi(helper);

err_fb_alloc_cmap:

	framebuffer_release(info);

err_fb_alloc:

err_fb_alloc:

	virtio_gpu_cmd_resource_inval_backing(vgdev, resid);

	virtio_gpu_cmd_resource_inval_backing(vgdev, resid);

err_obj_attach:

err_obj_attach:
@@ -371,15 +361,11 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
static int virtio_gpu_fbdev_destroy(struct drm_device *dev,

static int virtio_gpu_fbdev_destroy(struct drm_device *dev,

				    struct virtio_gpu_fbdev *vgfbdev)

				    struct virtio_gpu_fbdev *vgfbdev)

{

{

	struct fb_info *info;

	struct virtio_gpu_framebuffer *vgfb = &vgfbdev->vgfb;

	struct virtio_gpu_framebuffer *vgfb = &vgfbdev->vgfb;





	if (vgfbdev->helper.fbdev) {

	drm_fb_helper_unregister_fbi(&vgfbdev->helper);

		info = vgfbdev->helper.fbdev;

	drm_fb_helper_release_fbi(&vgfbdev->helper);





		unregister_framebuffer(info);

		framebuffer_release(info);

	}

	if (vgfb->obj)

	if (vgfb->obj)

		vgfb->obj = NULL;

		vgfb->obj = NULL;

	drm_fb_helper_fini(&vgfbdev->helper);

	drm_fb_helper_fini(&vgfbdev->helper);